ruby-1.9.3.286-2

- fix gem_extdir to include ruby_abi number
- fix macros.ruby to include ruby_abi number
- include site_ruby dir

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7015 ec354946-7b23-47d6-9f5a-488ba84defc7

r/ruby/ruby-vl.spec

@@ -33,8 +33,8 @@
 
 # Specify custom RubyGems root.
 %global gem_dir %{_datadir}/gems/%{ruby_abi}
-# TODO: Should we create arch specific rubygems-filesystem?
-%global gem_extdir %{_exec_prefix}/lib{,64}/gems/%{ruby_abi}
+%global gem_extdir %{_libdir}/gems/%{ruby_abi}
+%global gem_extdirs %{_exec_prefix}/lib{,64}/gems/%{ruby_abi}
 
 %global rake_version 0.9.2.2
 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
@@ -61,7 +61,7 @@ Version: %{ruby_version_patch_level}
 # we cannot reset the release number to 1 even when the main (ruby) version
 # is updated - because it may be that the versions of sub-components don't
 # change.
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: Development/Languages
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License: (Ruby or BSD) and Public Domain
@@ -462,19 +462,19 @@ cp misc/*.el %{SOURCE8} $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/%{rbmode}
 # Dump the macros into macro.ruby to use them to build other Ruby libraries.
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat >> %{buildroot}%{_sysconfdir}/rpm/macros.ruby << \EOF
-%%ruby_libdir %%{_datadir}/%{name}
-%%ruby_libarchdir %%{_libdir}/%{name}
+%%ruby_libdir %%{_datadir}/%{name}/%{ruby_abi}
+%%ruby_libarchdir %%{_libdir}/%{name}/%{ruby_abi}
 
 # This is the local lib/arch and should not be used for packaging.
 %%ruby_sitedir site_ruby
-%%ruby_sitelibdir %%{_prefix}/local/share/%{name}/%%{ruby_sitedir}
-%%ruby_sitearchdir %%{_prefix}/local/%%{_lib}/%{name}/%%{ruby_sitedir}
+%%ruby_sitelibdir %%{_prefix}/local/share/%{name}/%%{ruby_sitedir}/%{ruby_abi}
+%%ruby_sitearchdir %%{_prefix}/local/%%{_lib}/%{name}/%%{ruby_sitedir}/%{ruby_abi}
 
 # This is the general location for libs/archs compatible with all
 # or most of the Ruby versions
 %%ruby_vendordir vendor_ruby
-%%ruby_vendorlibdir %%{ruby_libdir}/%%{ruby_vendordir}
-%%ruby_vendorarchdir %%{ruby_libarchdir}/%%{ruby_vendordir}
+%%ruby_vendorlibdir %%{_datadir}/%{name}/%%{ruby_vendordir}/%{ruby_abi}
+%%ruby_vendorarchdir %%{_libdir}/%{name}/%%{ruby_vendordir}/%{ruby_abi}
 EOF
 
 cat >> %{buildroot}%{_sysconfdir}/rpm/macros.rubygems << \EOF
@@ -483,7 +483,7 @@ cat >> %{buildroot}%{_sysconfdir}/rpm/macros.rubygems << \EOF
 
 # Common gem locations and files.
 %%gem_instdir %%{gem_dir}/gems/%%{gem_name}-%%{version}
-%%gem_extdir %%{_libdir}/gems/exts/%%{gem_name}-%%{version}
+%%gem_extdir %%{_libdir}/gems/%{ruby_abi}/exts/%%{gem_name}-%%{version}
 %%gem_libdir %%{gem_instdir}/lib
 %%gem_cache %%{gem_dir}/cache/%%{gem_name}-%%{version}.gem
 %%gem_spec %%{gem_dir}/specifications/%%{gem_name}-%%{version}.gemspec
@@ -499,7 +499,7 @@ mkdir -p %{buildroot}%{gem_dir}
 mv %{buildroot}%{ruby_libdir}/gems/%{ruby_abi}/* %{buildroot}%{gem_dir}/
 
 # Create folders for gem binary extensions.
-mkdir -p %{buildroot}%{gem_extdir}/exts
+mkdir -p %{buildroot}%{gem_extdirs}/exts
 
 # Move bundled rubygems to %%gem_dir and %%gem_extdir
 # make symlinks for io-console and bigdecimal, which are considered to be part of stdlib by other Gems
@@ -509,24 +509,30 @@ mv %{buildroot}%{ruby_libdir}/rake* %{buildroot}%{gem_dir}/gems/rake-%{rake_vers
 mkdir -p %{buildroot}%{gem_dir}/gems/rdoc-%{rdoc_version}/lib
 mv %{buildroot}%{ruby_libdir}/rdoc* %{buildroot}%{gem_dir}/gems/rdoc-%{rdoc_version}/lib
 
+# gem_dir
 mkdir -p %{buildroot}%{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib
-mkdir -p %{buildroot}%{_libdir}/gems/exts/bigdecimal-%{bigdecimal_version}/lib
 mv %{buildroot}%{ruby_libdir}/bigdecimal %{buildroot}%{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib
 ln -s %{gem_dir}/gems/bigdecimal-%{bigdecimal_version}/lib/bigdecimal %{buildroot}%{ruby_libdir}/bigdecimal
-mv %{buildroot}%{ruby_libarchdir}/bigdecimal.so %{buildroot}%{_libdir}/gems/exts/bigdecimal-%{bigdecimal_version}/lib
-ln -s %{_libdir}/gems/exts/bigdecimal-%{bigdecimal_version}/lib/bigdecimal.so %{buildroot}%{ruby_libarchdir}/bigdecimal.so
+# gem_extdir
+mkdir -p %{buildroot}%{gem_extdir}/exts/bigdecimal-%{bigdecimal_version}/lib
+mv %{buildroot}%{ruby_libarchdir}/bigdecimal.so %{buildroot}%{gem_extdir}/exts/bigdecimal-%{bigdecimal_version}/lib
+ln -s %{gem_extdir}/exts/bigdecimal-%{bigdecimal_version}/lib/bigdecimal.so %{buildroot}%{ruby_libarchdir}/bigdecimal.so
 
+# gem_dir
 mkdir -p %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
-mkdir -p %{buildroot}%{_libdir}/gems/exts/io-console-%{io_console_version}/lib/io
 mv %{buildroot}%{ruby_libdir}/io %{buildroot}%{gem_dir}/gems/io-console-%{io_console_version}/lib
 ln -s %{gem_dir}/gems/io-console-%{io_console_version}/lib/io %{buildroot}%{ruby_libdir}/io
-mv %{buildroot}%{ruby_libarchdir}/io/console.so %{buildroot}%{_libdir}/gems/exts/io-console-%{io_console_version}/lib/io
-ln -s %{_libdir}/gems/exts/io-console-%{io_console_version}/lib/io/console.so %{buildroot}%{ruby_libarchdir}/io/console.so
+# gem_extdir
+mkdir -p %{buildroot}%{gem_extdir}/exts/io-console-%{io_console_version}/lib/io
+mv %{buildroot}%{ruby_libarchdir}/io/console.so %{buildroot}%{gem_extdir}/exts/io-console-%{io_console_version}/lib/io
+ln -s %{gem_extdir}/exts/io-console-%{io_console_version}/lib/io/console.so %{buildroot}%{ruby_libarchdir}/io/console.so
 
+# gem_dir
 mkdir -p %{buildroot}%{gem_dir}/gems/json-%{json_version}/lib
-mkdir -p %{buildroot}%{_libdir}/gems/exts/json-%{json_version}/lib
 mv %{buildroot}%{ruby_libdir}/json* %{buildroot}%{gem_dir}/gems/json-%{json_version}/lib
-mv %{buildroot}%{ruby_libarchdir}/json/ %{buildroot}%{_libdir}/gems/exts/json-%{json_version}/lib/
+# gem_extdir
+mkdir -p %{buildroot}%{gem_extdir}/exts/json-%{json_version}/lib
+mv %{buildroot}%{ruby_libarchdir}/json/ %{buildroot}%{gem_extdir}/exts/json-%{json_version}/lib/
 
 mkdir -p %{buildroot}%{gem_dir}/gems/minitest-%{minitest_version}/lib
 mv %{buildroot}%{ruby_libdir}/minitest %{buildroot}%{gem_dir}/gems/minitest-%{minitest_version}/lib
@@ -633,10 +639,8 @@ fi
 %lang(ja) %doc README.ja
 %doc NEWS
 %doc doc/NEWS-*
-# Exclude /usr/local directory since it is supposed to be managed by
-# local system administrator.
-%exclude %{ruby_sitelibdir}
-%exclude %{ruby_sitearchdir}
+%{ruby_sitelibdir}
+%{ruby_sitearchdir}
 %{ruby_vendorlibdir}
 %{ruby_vendorarchdir}
 
@@ -788,9 +792,9 @@ fi
 %{gem_dir}
 %exclude %{gem_dir}/gems/*
 %{_exec_prefix}/lib*/gems
-%exclude %{_exec_prefix}/lib*/gems/exts/bigdecimal-%{bigdecimal_version}
-%exclude %{_exec_prefix}/lib*/gems/exts/io-console-%{io_console_version}
-%exclude %{_exec_prefix}/lib*/gems/exts/json-%{json_version}
+%exclude %{_exec_prefix}/lib*/gems/%{ruby_abi}/exts/bigdecimal-%{bigdecimal_version}
+%exclude %{_exec_prefix}/lib*/gems/%{ruby_abi}/exts/io-console-%{io_console_version}
+%exclude %{_exec_prefix}/lib*/gems/%{ruby_abi}/exts/json-%{json_version}
 %exclude %{gem_dir}/gems/rake-%{rake_version}
 %exclude %{gem_dir}/gems/rdoc-%{rdoc_version}
 %exclude %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
@@ -833,19 +837,19 @@ fi
 %files -n rubygem-bigdecimal
 %{ruby_libdir}/bigdecimal
 %{ruby_libarchdir}/bigdecimal.so
-%{_libdir}/gems/exts/bigdecimal-%{bigdecimal_version}
+%{gem_extdir}/exts/bigdecimal-%{bigdecimal_version}
 %{gem_dir}/gems/bigdecimal-%{bigdecimal_version}
 %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
 
 %files -n rubygem-io-console
 %{ruby_libdir}/io
 %{ruby_libarchdir}/io/console.so
-%{_libdir}/gems/exts/io-console-%{io_console_version}
+%{gem_extdir}/exts/io-console-%{io_console_version}
 %{gem_dir}/gems/io-console-%{io_console_version}
 %{gem_dir}/specifications/io-console-%{io_console_version}.gemspec
 
 %files -n rubygem-json
-%{_libdir}/gems/exts/json-%{json_version}
+%{gem_extdir}/exts/json-%{json_version}
 %{gem_dir}/gems/json-%{json_version}
 %{gem_dir}/specifications/json-%{json_version}.gemspec
 
@@ -872,6 +876,11 @@ fi
 %endif
 
 %changelog
+* Fri Oct 26 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.3.286-2
+- fix gem_extdir to include ruby_abi number
+- fix macros.ruby to include ruby_abi number
+- include site_ruby dir
+
 * Tue Oct 23 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.3.286-1
 - update to 1.9.3-p286
 - rebase with fedora package