From 6f581b3a7fd3082f125d7b140addd51d4c2baf8d Mon Sep 17 00:00:00 2001 From: Sourav Moitra Date: Wed, 12 Aug 2015 20:11:37 +0530 Subject: [PATCH 1/5] Update to 1.8.3 --- rubygem-json.spec | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/rubygem-json.spec b/rubygem-json.spec index 1923911..3d46330 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -1,26 +1,24 @@ %global gem_name json Name: rubygem-%{gem_name} -Version: 1.7.7 -Release: 100%{?dist} +Version: 1.8.3 +Release: 1%{?dist} Summary: A JSON implementation in Ruby Group: Development/Languages License: Ruby or GPLv2 -URL: http://json.rubyforge.org +URL: http://flori.github.io/json/ Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems-devel BuildRequires: rubygem(rake) -BuildRequires: rubygem(minitest) +BuildRequires: rubygem(minitest4) BuildRequires: rubygem(bigdecimal) -Requires: ruby(release) -Requires: rubygems -Provides: rubygem(json) = %{version} +BuildRequires: rubygem(test-unit) Obsoletes: rubygem-%{gem_name}-gui < %{version} Obsoletes: ruby-%{gem_name}-gui < %{version} @@ -80,13 +78,10 @@ rm -fr .%{gem_instdir}/lib/json/pure* %install mkdir -p $RPM_BUILD_ROOT%{gem_dir} - -cp -a .%{gem_dir}/* %{buildroot}/%{gem_dir} +mkdir -p $RPM_BUILD_ROOT%{gem_extdir_mri} -# Let's move arch dependent files to arch specific directory -mkdir -p $RPM_BUILD_ROOT%{gem_extdir_mri}/lib/json/ext -install -cpm 0755 ./%{gem_instdir}/lib/json/ext/*.so \ - $RPM_BUILD_ROOT%{gem_extdir_mri}/lib/json/ext/ +cp -a .%{gem_dir}/* %{buildroot}/%{gem_dir} +cp -a .%{gem_extdir_mri}/{gem.build_complete,json} %{buildroot}/%{gem_extdir_mri}/ find $RPM_BUILD_ROOT%{gem_instdir} -name \*.rb -print0 | \ xargs --null chmod 0644 @@ -101,10 +96,15 @@ rm -rf $RPM_BUILD_ROOT%{gem_docdir}/rdoc/classes/.src rm -rf $RPM_BUILD_ROOT%{gem_docdir}/rdoc/classes/.html rm -rf $RPM_BUILD_ROOT%{gem_instdir}/java/ +# find and delete zero length files +find %{buildroot} -size 0 -delete + +chmod a+x %{buildroot}/%{gem_instdir}/tools/server.rb %check pushd .%{gem_instdir} -ruby -S testrb -Ilib:ext/%{gem_name}/ext $(ls -1 tests/test_*.rb | sort) +ruby -Ilib:$RPM_BUILD_ROOT%{gem_extdir_mri}:. \ + -e "gem 'minitest', '~> 4' ; Dir.glob('tests/test_*.rb').sort.each {|f| require f}" popd @@ -134,6 +134,10 @@ popd %changelog +* Wed Aug 12 2013 Sourav Moitra - 1.8.3-1 +- Update to 1.8.3 +- day change on changelog from sun to sat for version 1.6.5 + * Tue Mar 26 2013 Josef Stribny - 1.7.7-100 - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 - Update to JSON 1.7.7 @@ -148,7 +152,7 @@ popd * Sat Jul 21 2012 Fedora Release Engineering - 1.6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Sun Jan 21 2012 Mamoru Tasaka - 1.6.5-1 +* Sat Jan 21 2012 Mamoru Tasaka - 1.6.5-1 - 1.6.5 * Sat Jan 14 2012 Fedora Release Engineering - 1.4.6-4 From 5c644403d1c16e95d1735d2f8a0faaa4fd1abc45 Mon Sep 17 00:00:00 2001 From: Sourav Moitra Date: Thu, 13 Aug 2015 21:44:20 +0530 Subject: [PATCH 2/5] Added missing three lines requires ruby(release) requires rubygems provides rubygem(json) --- rubygem-json.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rubygem-json.spec b/rubygem-json.spec index 3d46330..b63f83d 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -20,10 +20,15 @@ BuildRequires: rubygem(minitest4) BuildRequires: rubygem(bigdecimal) BuildRequires: rubygem(test-unit) +Requires: ruby(release) +Requires: rubygems + Obsoletes: rubygem-%{gem_name}-gui < %{version} Obsoletes: ruby-%{gem_name}-gui < %{version} Obsoletes: ruby-%{gem_name} < %{version} +Provides: rubygem(json) = %{version} + %description This is a implementation of the JSON specification according to RFC 4627 in Ruby. @@ -134,7 +139,7 @@ popd %changelog -* Wed Aug 12 2013 Sourav Moitra - 1.8.3-1 +* Wed Aug 12 2015 Sourav Moitra - 1.8.3-1 - Update to 1.8.3 - day change on changelog from sun to sat for version 1.6.5 From a467f8cc530606f96bbc66455c27cc2838be24fc Mon Sep 17 00:00:00 2001 From: Sourav Moitra Date: Sat, 15 Aug 2015 00:00:45 +0530 Subject: [PATCH 3/5] Rubygem json-1.8.3 source added --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 528f30b..00de2aa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ json-1.1.7.gem /json-1.4.6.gem /json-1.6.5.gem /json-1.7.7.gem +/json-1.8.3.gem diff --git a/sources b/sources index acb3086..4746958 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9084ee2e853f55d956d043cba46e25fc json-1.7.7.gem +3d076c3efb7545020230e9c1de8ef284 json-1.8.3.gem From 2fd7714c55e10b4f01a50fb90237d18e63f12aa1 Mon Sep 17 00:00:00 2001 From: Sourav Moitra Date: Sat, 15 Aug 2015 00:24:03 +0530 Subject: [PATCH 4/5] dependency minitest4 to minitest --- rubygem-json.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-json.spec b/rubygem-json.spec index b63f83d..32450d2 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -16,7 +16,7 @@ BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems-devel BuildRequires: rubygem(rake) -BuildRequires: rubygem(minitest4) +BuildRequires: rubygem(minitest) BuildRequires: rubygem(bigdecimal) BuildRequires: rubygem(test-unit) From d49ebfd2706e57c6bea5b7e5f1c00acebc0fdb58 Mon Sep 17 00:00:00 2001 From: Sourav Moitra Date: Sat, 15 Aug 2015 01:38:22 +0530 Subject: [PATCH 5/5] removal of cp build_complete --- rubygem-json.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rubygem-json.spec b/rubygem-json.spec index 32450d2..eae17ed 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -86,7 +86,6 @@ mkdir -p $RPM_BUILD_ROOT%{gem_dir} mkdir -p $RPM_BUILD_ROOT%{gem_extdir_mri} cp -a .%{gem_dir}/* %{buildroot}/%{gem_dir} -cp -a .%{gem_extdir_mri}/{gem.build_complete,json} %{buildroot}/%{gem_extdir_mri}/ find $RPM_BUILD_ROOT%{gem_instdir} -name \*.rb -print0 | \ xargs --null chmod 0644