spec file adjusted to use new ruby 1.9 macros

1 files changed, 50 insertions, 52 deletions

diff --git a/rubygem-kgio.spec b/rubygem-kgio.spec
index b012083..cfc3f46 100644
--- a/rubygem-kgio.spec
+++ b/rubygem-kgio.spec
@@ -1,12 +1,8 @@
-%global gemname kgio
-
+%global gem_name kgio
 %global rubyabi 1.9.1
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 Summary:       Kinder, gentler I/O for Ruby
-Name:          rubygem-%{gemname}
+Name:          rubygem-%{gem_name}
 Version:       2.7.0
 Release:       4%{?dist}
 Group:         Development/Tools
@@ -14,7 +10,7 @@ License:       LGPLv2 or LGPLv3
 # LICENSE file defines the licencing aspects of kgiox.
 # No license info in source files. 
 URL:           http://bogomips.org/kgio
-Source0:       http://rubygems.org/downloads/%{gemname}-%{version}.gem
+Source0:       http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 # Simple patch file to fix automated test file 
 Source1:       no_ruby_strace_test_autopush.patch 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,9 +19,10 @@ Requires:      ruby(abi) = %{rubyabi}
 Requires:      ruby(rubygems) 
 BuildRequires: ruby 
 BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby(rubygems) 
+BuildRequires: rubygems-devel
 BuildRequires: ruby-devel
-Provides:      rubygem(%{gemname}) = %{version}
+BuildRequires: rubygem(minitest)
+Provides:      rubygem(%{gem_name}) = %{version}
 ExcludeArch:   ppc ppc64
 
 %description
@@ -46,73 +43,74 @@ Documentation for %{name}
 %setup -q -c -T
 
 %build
-mkdir -p .%{gemdir}
+mkdir -p .%{gem_dir}
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-gem install --local --install-dir .%{gemdir} \
+gem install --local --install-dir .%{gem_dir} \
             -V \
             --force %{SOURCE0}
 
 # Adjusting minor permissions
-chmod a+r .%{geminstdir}/ChangeLog
-chmod a+r .%{geminstdir}/NEWS
+chmod a+r .%{gem_instdir}/ChangeLog
+chmod a+r .%{gem_instdir}/NEWS
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-cp -a .%{gemdir}/* \
-        %{buildroot}%{gemdir}/
-patch %{buildroot}%{geminstdir}/test/test_autopush.rb %{SOURCE1}
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
+patch %{buildroot}%{gem_instdir}/test/test_autopush.rb %{SOURCE1}
 
 # Remove the binary extension sources and build leftovers.
-rm -f %{buildroot}%{geminstdir}/.document
-rm -f %{buildroot}%{geminstdir}/.gitignore
-rm -f %{buildroot}%{geminstdir}/.manifest
-rm -f %{buildroot}%{geminstdir}/.wrongdoc.yml
-rm -f %{buildroot}%{geminstdir}/pkg.mk
-rm -f %{buildroot}%{geminstdir}/setup.rb
-rm -f %{buildroot}/%{geminstdir}/kgio.gemspec
-rm -f %{buildroot}/%{geminstdir}/GNUmakefile
-rm -f %{buildroot}/%{geminstdir}/GIT-VERSION-FILE
-rm -f %{buildroot}/%{geminstdir}/GIT-VERSION-GEN
-rm -rf %{buildroot}%{geminstdir}/.yardoc
-rm -rf %{buildroot}%{geminstdir}/ext
-
-install -d -m0755 %{buildroot}%{ruby_sitearch}
-mv %{buildroot}%{geminstdir}/lib/kgio_ext.so %{buildroot}%{ruby_sitearch}
+rm -f %{buildroot}%{gem_instdir}/.document
+rm -f %{buildroot}%{gem_instdir}/.gitignore
+rm -f %{buildroot}%{gem_instdir}/.manifest
+rm -f %{buildroot}%{gem_instdir}/.wrongdoc.yml
+rm -f %{buildroot}%{gem_instdir}/pkg.mk
+rm -f %{buildroot}%{gem_instdir}/setup.rb
+rm -f %{buildroot}/%{gem_instdir}/kgio.gemspec
+rm -f %{buildroot}/%{gem_instdir}/GNUmakefile
+rm -f %{buildroot}/%{gem_instdir}/GIT-VERSION-FILE
+rm -f %{buildroot}/%{gem_instdir}/GIT-VERSION-GEN
+rm -rf %{buildroot}%{gem_instdir}/.yardoc
+rm -rf %{buildroot}%{gem_instdir}/ext
+
+install -d -m0755 %{buildroot}%{ruby_vendorarchdir}
+mv %{buildroot}%{gem_libdir}/kgio_ext.so %{buildroot}%{ruby_vendorarchdir}
 
 %check
 # Patch test_autopush.rb
-cd %{buildroot}%{geminstdir}
-RUBYOPT="-Ilib -I%{buildroot}%{ruby_sitearch} -Itest" testrb test/test_*
+cd %{buildroot}%{gem_instdir}
+RUBYOPT="-Ilib -I%{buildroot}%{ruby_vendorarchdir} -Itest" testrb test/test_*
 
 %clean
 rm -rf %{buildroot}
 
 %files doc
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/TODO
-%doc %{geminstdir}/LATEST
-%doc %{geminstdir}/Rakefile
-%doc %{geminstdir}/ISSUES
-%doc %{geminstdir}/HACKING
-%doc %{geminstdir}/test
+%doc %{gem_docdir}
+%doc %{gem_instdir}/TODO
+%doc %{gem_instdir}/LATEST
+%doc %{gem_instdir}/Rakefile
+%doc %{gem_instdir}/ISSUES
+%doc %{gem_instdir}/HACKING
+%doc %{gem_instdir}/test
 
 %files
-%{ruby_sitearch}/kgio_ext.so
-%dir %{geminstdir}
-%dir %{geminstdir}/lib
-%doc %{geminstdir}/LICENSE
-%doc %{geminstdir}/COPYING
-%doc %{geminstdir}/README
-%doc %{geminstdir}/NEWS
-%doc %{geminstdir}/ChangeLog
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%{geminstdir}/lib/kgio.rb
+%{ruby_vendorarchdir}/kgio_ext.so
+%dir %{gem_instdir}
+%dir %{gem_libdir}
+%doc %{gem_instdir}/LICENSE
+%doc %{gem_instdir}/COPYING
+%doc %{gem_instdir}/README
+%doc %{gem_instdir}/NEWS
+%doc %{gem_instdir}/ChangeLog
+%{gem_cache}
+%{gem_spec}
+%{gem_libdir}/kgio.rb
 
 %changelog
 * Tue Jan 07 2012 Guillermo Gómez <guillermo.gomez@gmail.com> - 2.7.0-4
 - Requires fixed for Ruby 1.9
+- Spec file adjusted to use new macros
 
 * Sun Jan 01 2012 Guillermo Gómez <guillermo.gomez@gmail.com> - 2.7.0-3
 - Path to kgio_ext.so at spec file check section fixed