From f619483136aa2b6a358fa8923c2f2f5ee5aeec39 Mon Sep 17 00:00:00 2001
From: Xavier Lamien <laxathom@lxtnow.net>
Date: Wed, 7 Nov 2012 00:36:26 +0100
Subject: [PATCH] Update to upstream release. Add mtasaka changes request as
 well.

---
 rubygem-json.spec | 51 +++++++++++++++++++++++++++++++----------------
 sources           |  2 +-
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/rubygem-json.spec b/rubygem-json.spec
index 0a05cfb..65f5c8f 100644
--- a/rubygem-json.spec
+++ b/rubygem-json.spec
@@ -2,8 +2,8 @@
 %global	rubyabi	1.9.1
 
 Name:           rubygem-%{gem_name}
-Version:        1.6.5
-Release:        2%{?dist}
+Version:        1.7.5
+Release:        1%{?dist}
 
 Summary:        A JSON implementation in Ruby
 
@@ -47,15 +47,31 @@ This package contains documentation for %{name}.
 %setup -q -c -T
 mkdir -p ./%{gem_dir}
 
+# Gem repack
+TOPDIR=$(pwd)
+mkdir tmpunpackdir
+pushd tmpunpackdir
+
+gem unpack %{SOURCE0}
+cd %{gem_name}-%{version}
+
+# Change cflags to honor Fedora compiler flags correctly
+find . -name extconf.rb | xargs sed -i -e 's|-O3|-O2|' -e 's|-O0|-O2|'
+
+gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
+gem build %{gem_name}.gemspec
+mv %{gem_name}-%{version}.gem $TOPDIR
+
+popd
+rm -rf tmpunpackdir
+
+
 %build
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 gem install --local --install-dir .%{gem_dir} -V --force %{SOURCE0}
 
 find . -name \*gem -exec chmod 0644 {} \;
 
-# change cflags to honor Fedora compiler flags correctly
-find . -name extconf.rb | xargs sed -i -e 's|-O3|-O2|'
-find . -name Makefile | xargs sed -i -e 's|-O3|-O2|'
 # compile again
 find . -name extconf.rb | while read f
 do
@@ -72,14 +88,12 @@ mkdir -p $RPM_BUILD_ROOT%{gem_extdir}/ext/%{gem_name}/ext
 cp -a .%{gem_dir}/* %{buildroot}/%{gem_dir}
 
 # Let's move arch dependent files to arch specific directory
-cp -a ./%{gem_instdir}/ext/json/ext/json \
-	$RPM_BUILD_ROOT%{gem_extdir}/ext/%{gem_name}/ext
+mkdir -p $RPM_BUILD_ROOT%{gem_extdir}/lib/json/ext
+install -cpm 0755 ./%{gem_instdir}/lib/json/ext/*.so \
+	$RPM_BUILD_ROOT%{gem_extdir}/lib/json/ext/
 
-chmod 0644 $RPM_BUILD_ROOT%{gem_instdir}/install.rb
-chmod 0644 $RPM_BUILD_ROOT%{gem_instdir}/tests/*.rb
-chmod 0644 $RPM_BUILD_ROOT%{gem_instdir}/tools/server.rb
-chmod 0644 $RPM_BUILD_ROOT%{gem_instdir}/tools/fuzz.rb
-chmod 0644 $RPM_BUILD_ROOT%{gem_instdir}/benchmarks/*.rb
+find $RPM_BUILD_ROOT%{gem_instdir} -name \*.rb -print0 | \
+	xargs --null chmod 0644
 
 # We don't need those files anymore.
 rm -rf $RPM_BUILD_ROOT%{gem_instdir}/ext
@@ -101,7 +115,6 @@ popd
 %files
 %defattr(-,root,root,-)
 %doc %{gem_instdir}/[A-Z]*
-%exclude	%{gem_instdir}/Rakefile
 %dir %{gem_instdir}
 %dir %{gem_instdir}/lib
 %dir %{gem_instdir}/lib/%{gem_name}
@@ -111,22 +124,26 @@ popd
 %{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_cache}
 %{gem_spec}
+%exclude %{gem_cache}
+%exclude %{gem_instdir}/Rakefile
 
 %files      doc
 %defattr(-,root,root,-)
 %{gem_instdir}/Rakefile
 %{gem_instdir}/data
-%{gem_instdir}/tests
-%{gem_instdir}/benchmarks
 %{gem_instdir}/*gemspec
-#%{gem_instdir}/doc-main.txt
 %{gem_docdir}/
+%exclude %{gem_instdir}/tests
 
 
 %changelog
+* Tue Nov 06 2012 Xavier Lamien <laxathom@lxtnow.net> - 1.7.5-1
+- Update to Upstream release.
+- Add mtasaka changes request.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index b0943d9..284bafa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0e552b276b2bfb90a8a998c34db19ee  json-1.6.5.gem
+3c0185415bfabce7e9b4d0394c92661b  json-1.7.5.gem