ruby: remove ruby_abi from gem_dir

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

r/ruby/ruby-vl.spec

@@ -32,9 +32,9 @@
 %global rubygems_dir %{_datadir}/rubygems
 
 # Specify custom RubyGems root.
-%global gem_dir %{_datadir}/gems/%{ruby_abi}
-%global gem_extdir %{_libdir}/gems/%{ruby_abi}
-%global gem_extdirs %{_exec_prefix}/lib{,64}/gems/%{ruby_abi}
+%global gem_dir %{_datadir}/gems
+%global gem_extdir %{_libdir}/gems
+%global gem_extdirs %{_exec_prefix}/lib{,64}/gems
 
 %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: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 Group: Development/Languages
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License: (Ruby or BSD) and Public Domain
@@ -487,7 +487,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/%{ruby_abi}/exts/%%{gem_name}-%%{version}
+%%gem_extdir %%{_libdir}/gems/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,14 +499,14 @@ mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
 cp %{SOURCE1} %{buildroot}%{rubygems_dir}/rubygems/defaults
 
 # Move gems root into common direcotry, out of Ruby directory structure.
-mkdir -p %{buildroot}%{gem_dir}
-mv %{buildroot}%{ruby_libdir}/gems/%{ruby_abi}/* %{buildroot}%{gem_dir}/
+mv %{buildroot}%{ruby_libdir}/gems/%{ruby_abi} %{buildroot}%{gem_dir}
 
 # Create folders for gem binary extensions.
 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
+# make symlinks for io-console and bigdecimal, 
+# which are considered to be part of stdlib by other Gems
 mkdir -p %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/lib
 mv %{buildroot}%{ruby_libdir}/rake* %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/lib
 
@@ -796,9 +796,9 @@ fi
 %{gem_dir}
 %exclude %{gem_dir}/gems/*
 %{_exec_prefix}/lib*/gems
-%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 %{_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 %{gem_dir}/gems/rake-%{rake_version}
 %exclude %{gem_dir}/gems/rdoc-%{rdoc_version}
 %exclude %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec
@@ -880,6 +880,9 @@ fi
 %endif
 
 %changelog
+* Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.3.327-4
+- remove ruby_abi from gem_dir
+
 * Sun Nov 11 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.3.327-3
 - update to 1.9.3-p327
 - add patch10 to skip network related test