Use the macros defined in ./macros.ruby

1 files changed, 67 insertions, 65 deletions

diff --git a/ruby-1.9.1.spec b/ruby-1.9.1.spec
index e2e852c..964e854 100644
--- a/ruby-1.9.1.spec
+++ b/ruby-1.9.1.spec
@@ -18,11 +18,11 @@
 
 %global _compatsuffix   %{?rubymmtver:-%{rubymmtver}}
 
-%global _sitedir        %{_usr}/local/share/ruby/
-%global _sitearchdir    %{_usr}/local/%{_lib}/ruby/
+%global ruby_sitelib        %{_usr}/local/share/ruby/
+%global ruby_sitearch    %{_usr}/local/%{_lib}/ruby/
 
-%global _vendordir      %{_datadir}/ruby/
-%global _vendorarchdir  %{_libdir}/ruby/
+%global ruby_vendorlib      %{_datadir}/ruby/
+%global ruby_vendorarch  %{_libdir}/ruby/
 
 %global _normalized_cpu %(echo `echo %{_target_cpu} | sed 's/^ppc/powerpc/'`)
 
@@ -200,10 +200,10 @@ export rb_cv_func_strtod
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CFLAGS
 %configure \
-    --with-sitedir='%{_sitedir}' \
-    --with-sitearchdir='%{_sitearchdir}' \
-    --with-vendordir='%{_vendordir}' \
-    --with-vendorarchdir='%{_vendorarchdir}' \
+    --with-sitedir='%{ruby_sitelib}' \
+    --with-sitearchdir='%{ruby_sitearch}' \
+    --with-vendordir='%{ruby_vendorlib}' \
+    --with-vendorarchdir='%{ruby_vendorarch}' \
     --program-suffix='%{?_compatsuffix}' \
     --enable-shared \
     --enable-pthread \
@@ -218,29 +218,29 @@ rm -rf %{buildroot}
 # installing binaries ...
 make DESTDIR=%{buildroot} install
 
-mkdir -p %{buildroot}/%{_sitedir} \
-        %{buildroot}/%{_sitearchdir} \
-        %{buildroot}/%{_vendordir} \
-        %{buildroot}/%{_vendorarchdir}
+mkdir -p %{buildroot}/%{ruby_sitelib_191} \
+        %{buildroot}/%{ruby_sitearch_191} \
+        %{buildroot}/%{ruby_vendorlib_191} \
+        %{buildroot}/%{ruby_vendorarch_191}
 
 # generate ri doc
 rm -rf .ext/rdoc
-LD_LIBRARY_PATH=%{buildroot}%{_libdir} RUBYLIB=%{buildroot}%{_vendorarchdir} make DESTDIR=%{buildroot} install-doc
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} RUBYLIB=%{buildroot}%{ruby_vendorarch} make DESTDIR=%{buildroot} install-doc
 
 # Find files with a shebang that do not have executable permissions
-for script in `find %{buildroot}/%{_sitedir} -type f ! -perm /a+x -name "*.rb"`; do
+for script in `find %{buildroot}/%{ruby_sitelib} -type f ! -perm /a+x -name "*.rb"`; do
     [ ! -z "`head -n 1 $script | grep \"^#!/\"`" ] && chmod -v 755 $script
 done
 
 # Fix shebang
-for script in `find %{buildroot}/%{_sitedir} -type f -name "*.rb"`; do
+for script in `find %{buildroot}/%{ruby_sitelib} -type f -name "*.rb"`; do
     sed -r -i -e 's|(.*)/bin/ruby|%{_bindir}/ruby%{?_compatsuffix}|g' $script
 done
 
 if [ ! -d %{buildroot}/%{_includedir}/%{name}/ ]; then
     # The headers are probably in the vendor arch dir
     mkdir -p %{buildroot}/%{_includedir}/%{name}/
-    find %{buildroot}/%{_vendorarchdir} -mindepth 1 -maxdepth 1 -type f ! -name "*.so" -exec mv -v {} %{buildroot}/%{_includedir}/%{name}/. \;
+    find %{buildroot}/%{ruby_vendorarch} -mindepth 1 -maxdepth 1 -type f ! -name "*.so" -exec mv -v {} %{buildroot}/%{_includedir}/%{name}/. \;
 fi
 %clean
 rm -rf %{buildroot}
@@ -280,8 +280,8 @@ rm -rf %{buildroot}
 %files irb
 %defattr(-, root, root, -)
 %{_bindir}/irb%{?_compatsuffix}
-%{_vendordir}/%{?rubymmtver}/irb.rb
-%{_vendordir}/%{?rubymmtver}/irb
+%{ruby_vendorlib}/%{?rubymmtver}/irb.rb
+%{ruby_vendorlib}/%{?rubymmtver}/irb
 
 %files libs
 %defattr(-, root, root, -)
@@ -292,49 +292,51 @@ rm -rf %{buildroot}
 %doc LEGAL
 %doc LGPL
 %dir %{_datadir}/ruby
-%dir %{_sitedir}/%{rubymmtver}
-%dir %{_sitearchdir}/%{rubymmtver}
-%dir %{_vendordir}/%{rubymmtver}
-%{_vendorarchdir}/%{rubymmtver}
+%dir %{ruby_sitelib}/%{rubymmtver}
+%dir %{ruby_sitearch}/%{rubymmtver}
+%dir %{ruby_vendorlib_191}
+%{ruby_vendorarch_191}
 # The following files should go into the ruby-irb package.
-%exclude %{_vendordir}/%{rubymmtver}/irb.rb
-%exclude %{_vendordir}/%{rubymmtver}/irb
+%exclude %{ruby_vendorlib_191}/irb.rb
+%exclude %{ruby_vendorlib_191}/irb
 # The following files should go into the ruby-rdoc package.
-%exclude %{_vendordir}/%{rubymmtver}/rdoc
+%exclude %{ruby_vendorlib_191}/rdoc
 # The following files should go into the ruby-tcltk package.
-%exclude %{_vendordir}/%{rubymmtver}/*tk.rb
-%exclude %{_vendordir}/%{rubymmtver}/tcltk.rb
-%exclude %{_vendordir}/%{rubymmtver}/tk
-%exclude %{_vendordir}/%{rubymmtver}/tk*.rb
-%exclude %{_vendordir}/%{rubymmtver}/tkextlib
-%exclude %{_vendorarchdir}/%{rubymmtver}/tcltklib.so
-%exclude %{_vendorarchdir}/%{rubymmtver}/tkutil.so
+%exclude %{ruby_vendorlib_191}/*tk.rb
+%exclude %{ruby_vendorlib_191}/tcltk.rb
+%exclude %{ruby_vendorlib_191}/tk
+%exclude %{ruby_vendorlib_191}/tk*.rb
+%exclude %{ruby_vendorlib_191}/tkextlib
+%exclude %{ruby_vendorarch_191}/tcltklib.so
+%exclude %{ruby_vendorarch_191}/tkutil.so
 # files in ruby-libs from here
-%{_vendordir}/%{rubymmtver}/*.rb
-%{_vendordir}/%{rubymmtver}/bigdecimal
-%{_vendordir}/%{rubymmtver}/cgi
-%{_vendordir}/%{rubymmtver}/date
-%{_vendordir}/%{rubymmtver}/digest
-%{_vendordir}/%{rubymmtver}/dl
-%{_vendordir}/%{rubymmtver}/drb
-%{_vendordir}/%{rubymmtver}/io
-%{_vendordir}/%{rubymmtver}/net
-%{_vendordir}/%{rubymmtver}/openssl
-%{_vendordir}/%{rubymmtver}/optparse
-%{_vendordir}/%{rubymmtver}/racc
-%{_vendordir}/%{rubymmtver}/rexml
-%{_vendordir}/%{rubymmtver}/rinda
-%{_vendordir}/%{rubymmtver}/rss
-%{_vendordir}/%{rubymmtver}/runit
-%{_vendordir}/%{rubymmtver}/shell
-%{_vendordir}/%{rubymmtver}/soap
-%{_vendordir}/%{rubymmtver}/test
-%{_vendordir}/%{rubymmtver}/uri
-%{_vendordir}/%{rubymmtver}/webrick
-%{_vendordir}/%{rubymmtver}/wsdl
-%{_vendordir}/%{rubymmtver}/xmlrpc
-%{_vendordir}/%{rubymmtver}/xsd
-%{_vendordir}/%{rubymmtver}/yaml
+%{ruby_vendorlib_191}/*.rb
+%{ruby_vendorlib_191}/bigdecimal
+%{ruby_vendorlib_191}/cgi
+%{ruby_vendorlib_191}/date
+%{ruby_vendorlib_191}/digest
+%{ruby_vendorlib_191}/dl
+%{ruby_vendorlib_191}/drb
+%{ruby_vendorlib_191}/rubygems
+%{ruby_vendorlib_191}/io
+%{ruby_vendorlib_191}/json
+%{ruby_vendorlib_191}/minitest
+%{ruby_vendorlib_191}/net
+%{ruby_vendorlib_191}/openssl
+%{ruby_vendorlib_191}/optparse
+%{ruby_vendorlib_191}/racc
+%{ruby_vendorlib_191}/rake
+%{ruby_vendorlib_191}/rbconfig
+%{ruby_vendorlib_191}/rexml
+%{ruby_vendorlib_191}/rinda
+%{ruby_vendorlib_191}/ripper
+%{ruby_vendorlib_191}/rss
+%{ruby_vendorlib_191}/shell
+%{ruby_vendorlib_191}/test
+%{ruby_vendorlib_191}/uri
+%{ruby_vendorlib_191}/webrick
+%{ruby_vendorlib_191}/xmlrpc
+%{ruby_vendorlib_191}/yaml
 %{_libdir}/libruby%{?_compatsuffix}.so.*
 
 %files mode
@@ -345,7 +347,7 @@ rm -rf %{buildroot}
 %files rdoc
 %defattr(-, root, root, -)
 %{_bindir}/rdoc%{?_compatsuffix}
-%{_vendordir}/%{rubymmtver}/rdoc
+%{ruby_vendorlib_191}/rdoc
 
 %files ri
 %defattr(-, root, root, -)
@@ -358,13 +360,13 @@ rm -rf %{buildroot}
 
 %files tcltk
 %defattr(-, root, root, -)
-%{_vendordir}/%{rubymmtver}/*-tk.rb
-%{_vendordir}/%{rubymmtver}/tcltk.rb
-%{_vendordir}/%{rubymmtver}/tk
-%{_vendordir}/%{rubymmtver}/tk*.rb
-%{_vendordir}/%{rubymmtver}/tkextlib
-%{_vendorarchdir}/%{rubymmtver}/tcltklib.so
-%{_vendorarchdir}/%{rubymmtver}/tkutil.so
+%{ruby_vendorlib_191}/*-tk.rb
+%{ruby_vendorlib_191}/tcltk.rb
+%{ruby_vendorlib_191}/tk
+%{ruby_vendorlib_191}/tk*.rb
+%{ruby_vendorlib_191}/tkextlib
+%{ruby_vendorarch_191}/tcltklib.so
+%{ruby_vendorarch_191}/tkutil.so
 
 %changelog
 * Sun Dec 20 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.8.6.383-6