[rubygem-json] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 Update to JSON 1.7.7

Vít Ondruch vondruch at fedoraproject.org
Wed Mar 27 09:40:47 UTC 2013


commit 3ee485e3cf6e5de3580d1c892081ea88f37c6780
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Mar 27 10:27:45 2013 +0100

    Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
    Update to JSON 1.7.7

 .gitignore                        |    1 +
 json-1.4.3-skip-failed-test.patch |   12 ------------
 rubygem-json.spec                 |   35 +++++++++++++++++------------------
 sources                           |    2 +-
 4 files changed, 19 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9821bef..528f30b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 json-1.1.7.gem
 /json-1.4.6.gem
 /json-1.6.5.gem
+/json-1.7.7.gem
diff --git a/rubygem-json.spec b/rubygem-json.spec
index c5222ba..99cc41b 100644
--- a/rubygem-json.spec
+++ b/rubygem-json.spec
@@ -1,8 +1,8 @@
 %global	gem_name	json
 
 Name:           rubygem-%{gem_name}
-Version:        1.7.5
-Release:        3%{?dist}
+Version:        1.7.7
+Release:        100%{?dist}
 
 Summary:        A JSON implementation in Ruby
 
@@ -65,7 +65,7 @@ rm -rf tmpunpackdir
 
 
 %build
-%gem_install -n %{SOURCE0}
+%gem_install
 
 find . -name \*gem -exec chmod 0644 {} \;
 
@@ -80,14 +80,14 @@ rm -fr .%{gem_instdir}/lib/json/pure*
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{gem_dir}
-mkdir -p $RPM_BUILD_ROOT%{gem_extdir}/ext/%{gem_name}/ext
+mkdir -p $RPM_BUILD_ROOT%{gem_extdir_mri}/ext/%{gem_name}/ext
  
 cp -a .%{gem_dir}/* %{buildroot}/%{gem_dir}
 
 # Let's move arch dependent files to arch specific directory
-mkdir -p $RPM_BUILD_ROOT%{gem_extdir}/lib/json/ext
+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}/lib/json/ext/
+	$RPM_BUILD_ROOT%{gem_extdir_mri}/lib/json/ext/
 
 find $RPM_BUILD_ROOT%{gem_instdir} -name \*.rb -print0 | \
 	xargs --null chmod 0644
@@ -110,25 +110,23 @@ popd
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{gem_instdir}/[A-Z]*
 %dir %{gem_instdir}
-%dir %{gem_instdir}/lib
-%dir %{gem_instdir}/lib/%{gem_name}
+%dir %{gem_libdir}
+%dir %{gem_libdir}/%{gem_name}
 %{gem_instdir}/tools/
-%{gem_instdir}/lib/%{gem_name}.rb
-%{gem_instdir}/lib/%{gem_name}/add
-%{gem_instdir}/lib/%{gem_name}/common.rb
-%{gem_instdir}/lib/%{gem_name}/ext.rb
-%{gem_instdir}/lib/%{gem_name}/version.rb
-%{gem_instdir}/lib/%{gem_name}/generic_object.rb
-%{gem_extdir}/
+%{gem_libdir}/%{gem_name}.rb
+%{gem_libdir}/%{gem_name}/add
+%{gem_libdir}/%{gem_name}/common.rb
+%{gem_libdir}/%{gem_name}/ext.rb
+%{gem_libdir}/%{gem_name}/version.rb
+%{gem_libdir}/%{gem_name}/generic_object.rb
+%{gem_extdir_mri}/
 %{gem_spec}
 %exclude %{gem_cache}
 %exclude %{gem_instdir}/Rakefile
 
 %files      doc
-%defattr(-,root,root,-)
 %{gem_instdir}/Rakefile
 %{gem_instdir}/data
 %{gem_instdir}/*gemspec
@@ -137,8 +135,9 @@ popd
 
 
 %changelog
-* Tue Feb 19 2013 Vít Ondruch <vondruch at redhat.com> - 1.7.5-3
+* Tue Mar 26 2013 Josef Stribny <jstribny at redhat.com> - 1.7.7-100
 - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+- Update to JSON 1.7.7
 
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 284bafa..acb3086 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c0185415bfabce7e9b4d0394c92661b  json-1.7.5.gem
+9084ee2e853f55d956d043cba46e25fc  json-1.7.7.gem


More information about the scm-commits mailing list