Use macros as defined in ./macros.ruby (1.8.6 spec)

1 files changed, 61 insertions, 67 deletions

diff --git a/ruby-1.8.6.spec b/ruby-1.8.6.spec
index e680a92..47d313b 100644
--- a/ruby-1.8.6.spec
+++ b/ruby-1.8.6.spec
@@ -18,12 +18,6 @@
 
 %global _compatsuffix   %{?rubymmtver:-%{rubymmtver}}
 
-%global _sitedir        %{_usr}/local/share/ruby/
-%global _sitearchdir    %{_usr}/local/%{_lib}/ruby/
-
-%global _vendordir      %{_datadir}/ruby/
-%global _vendorarchdir  %{_libdir}/ruby/
-
 %global _normalized_cpu %(echo `echo %{_target_cpu} | sed 's/^ppc/powerpc/'`)
 
 Name:           ruby%{?_compatsuffix}
@@ -226,10 +220,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}' \
     --with-default-kcode=none \
     --enable-shared \
@@ -245,29 +239,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} \
+        %{buildroot}/%{ruby_sitearch} \
+        %{buildroot}/%{ruby_vendorlib} \
+        %{buildroot}/%{ruby_vendorarch}
 
 # 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}
@@ -307,8 +301,8 @@ rm -rf %{buildroot}
 %files irb
 %defattr(-, root, root, -)
 %{_bindir}/irb%{?_compatsuffix}
-%{_vendordir}/%{?rubymmtver}/irb.rb
-%{_vendordir}/%{?rubymmtver}/irb
+%{ruby_vendorlib_186}/irb.rb
+%{ruby_vendorlib_186}/irb
 
 %files libs
 %defattr(-, root, root, -)
@@ -319,49 +313,49 @@ rm -rf %{buildroot}
 %doc LEGAL
 %doc LGPL
 %dir %{_datadir}/ruby
-%dir %{_sitedir}/%{rubymmtver}
-%dir %{_sitearchdir}/%{rubymmtver}
-%dir %{_vendordir}/%{rubymmtver}
-%{_vendorarchdir}/%{rubymmtver}
+%dir %{ruby_sitelib_186}
+%dir %{ruby_sitearch_186}
+%dir %{ruby_vendorlib_186}
+%{ruby_vendorarch_186}
 # The following files should go into the ruby-irb package.
-%exclude %{_vendordir}/%{rubymmtver}/irb.rb
-%exclude %{_vendordir}/%{rubymmtver}/irb
+%exclude %{ruby_vendorlib_186}/irb.rb
+%exclude %{ruby_vendorlib_186}/irb
 # The following files should go into the ruby-rdoc package.
-%exclude %{_vendordir}/%{rubymmtver}/rdoc
+%exclude %{ruby_vendorlib_186}/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_186}/*tk.rb
+%exclude %{ruby_vendorlib_186}/tcltk.rb
+%exclude %{ruby_vendorlib_186}/tk
+%exclude %{ruby_vendorlib_186}/tk*.rb
+%exclude %{ruby_vendorlib_186}/tkextlib
+%exclude %{ruby_vendorarch_186}/tcltklib.so
+%exclude %{ruby_vendorarch_186}/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_186}/*.rb
+%{ruby_vendorlib_186}/bigdecimal
+%{ruby_vendorlib_186}/cgi
+%{ruby_vendorlib_186}/date
+%{ruby_vendorlib_186}/digest
+%{ruby_vendorlib_186}/dl
+%{ruby_vendorlib_186}/drb
+%{ruby_vendorlib_186}/io
+%{ruby_vendorlib_186}/net
+%{ruby_vendorlib_186}/openssl
+%{ruby_vendorlib_186}/optparse
+%{ruby_vendorlib_186}/racc
+%{ruby_vendorlib_186}/rexml
+%{ruby_vendorlib_186}/rinda
+%{ruby_vendorlib_186}/rss
+%{ruby_vendorlib_186}/runit
+%{ruby_vendorlib_186}/shell
+%{ruby_vendorlib_186}/soap
+%{ruby_vendorlib_186}/test
+%{ruby_vendorlib_186}/uri
+%{ruby_vendorlib_186}/webrick
+%{ruby_vendorlib_186}/wsdl
+%{ruby_vendorlib_186}/xmlrpc
+%{ruby_vendorlib_186}/xsd
+%{ruby_vendorlib_186}/yaml
 %{_libdir}/libruby%{?_compatsuffix}.so.*
 
 %files mode
@@ -372,7 +366,7 @@ rm -rf %{buildroot}
 %files rdoc
 %defattr(-, root, root, -)
 %{_bindir}/rdoc%{?_compatsuffix}
-%{_vendordir}/%{rubymmtver}/rdoc
+%{ruby_vendorlib_186}/rdoc
 
 %files ri
 %defattr(-, root, root, -)
@@ -385,13 +379,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_186}/*-tk.rb
+%{ruby_vendorlib_186}/tcltk.rb
+%{ruby_vendorlib_186}/tk
+%{ruby_vendorlib_186}/tk*.rb
+%{ruby_vendorlib_186}/tkextlib
+%{ruby_vendorarch_186}/tcltklib.so
+%{ruby_vendorarch_186}/tkutil.so
 
 %changelog
 * Sun Dec 20 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1.8.6.383-6