add versions to libdirs; try legacy paths multivalues harder

diff --git a/ruby.spec b/ruby.spec
index 1014510564ce0a92ef38c21df2690e7e52f5d6fa..66ec4ea897a0f7529d954b3d891390f52b65f619 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -43,7 +43,7 @@ Summary(pt_BR.UTF-8): Linguagem de script orientada a objeto
 Summary(zh_CN.UTF-8):  ruby - 一种快速高效的面向对象脚本编程语言
 Name:          ruby
 Version:       %{basever}.%{patchlevel}
-Release:       0.3
+Release:       0.5
 Epoch:         1
 License:       The Ruby License
 Group:         Development/Languages
@@ -138,10 +138,10 @@ BuildRoot:        %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        legacy_vendorlibdir             %{_libdir}/%{name}/%{ruby_vendordir}/%{ruby_version}
 %define        legacy_vendorarchdir    %{_libdir}/%{name}/%{ruby_vendordir}/%{ruby_version}/%{_arch}-linux
 
-%define        legacy_siteloadpath             %{legacy_sitelibdir}\0%{legacy_sitearchdir}\0%{legacy_sitedir}
-%define        legacy_vendorloadpath   %{legacy_vendorlibdir}\0%{legacy_vendorarchdir}\0%{legacy_vendordir}
-%define        legacy_loadpath                 %{legacy_libdir}\0%{legacy_archdir}
-%define        legacy_loadpaths                %{legacy_siteloadpath}\0%{legacy_vendorloadpath}\0%{legacy_loadpath}
+%define        legacy_siteloadpath             %{legacy_sitelibdir}\\0%{legacy_sitearchdir}\\0%{legacy_sitedir}
+%define        legacy_vendorloadpath   %{legacy_vendorlibdir}\\0%{legacy_vendorarchdir}\\0%{legacy_vendordir}
+%define        legacy_loadpath                 %{legacy_libdir}\\0%{legacy_archdir}
+%define        legacy_loadpaths                %{legacy_siteloadpath}\\0%{legacy_vendorloadpath}\\0%{legacy_loadpath}
 
 # bleh, some nasty (gcc or ruby) bug still not fixed
 # (SEGV or "unexpected break" on miniruby run during build)
@@ -363,7 +363,7 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1
 %if %{without batteries}
 # packaged separately
 %{__rm} -r $RPM_BUILD_ROOT%{ruby_libdir}/%{ruby_version}/{rubygems,rake,json,tasks}
-%{__rm} -r $RPM_BUILD_ROOT%{ruby_libarchdir}/json
+%{__rm} -r $RPM_BUILD_ROOT%{ruby_libarchdir}/%{ruby_version}/json
 %{__rm} $RPM_BUILD_ROOT%{ruby_libdir}/%{ruby_version}/{rake,rubygems,json}.rb
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/{gem,rake}
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rake*
@@ -415,9 +415,12 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with batteries}
 %{_mandir}/man1/rake.1*
 %endif
+
 %dir %{ruby_libarchdir}
 #%dir %{ruby_libarchdir}/%{ruby_version}
 %dir %{ruby_libdir}
+#%dir %{ruby_libarchdir}/%{ruby_version}/%{ruby_version}
+#%dir %{ruby_archdir}/%{ruby_version}
 #%dir %{ruby_libdir}/%{ruby_version}
 %dir %{ruby_sitelibdir}
 %dir %{ruby_sitelibdir}/%{ruby_version}
@@ -450,7 +453,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/%{ruby_version}/tk*.rb
 %{ruby_libdir}/%{ruby_version}/tk
 %{ruby_libdir}/%{ruby_version}/tkextlib
-%attr(755,root,root) %{ruby_libarchdir}/t*.so
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/t*.so
 %endif
 
 %files modules
@@ -505,28 +508,28 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/%{ruby_version}/tracer.rb
 %{ruby_libdir}/%{ruby_version}/tsort.rb
 %{ruby_libdir}/%{ruby_version}/[u-z]*.rb
-%attr(755,root,root) %{ruby_libarchdir}/[a-s]*.so
-%attr(755,root,root) %{ruby_libarchdir}/[u-z]*.so
-%dir %{ruby_libarchdir}/digest
-%attr(755,root,root) %{ruby_libarchdir}/digest/*.so
-%dir %{ruby_libarchdir}/dl
-%attr(755,root,root) %{ruby_libarchdir}/dl/callback.so
-%dir %{ruby_libarchdir}/enc
-%attr(755,root,root) %{ruby_libarchdir}/enc/*.so
-%dir %{ruby_libarchdir}/enc/trans
-%attr(755,root,root) %{ruby_libarchdir}/enc/trans/*.so
-%dir %{ruby_libarchdir}/io
-%attr(755,root,root) %{ruby_libarchdir}/io/*.so
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/[a-s]*.so
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/[u-z]*.so
+%dir %{ruby_libarchdir}/%{ruby_version}/digest
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/digest/*.so
+%dir %{ruby_libarchdir}/%{ruby_version}/dl
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/dl/callback.so
+%dir %{ruby_libarchdir}/%{ruby_version}/enc
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/enc/*.so
+%dir %{ruby_libarchdir}/%{ruby_version}/enc/trans
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/enc/trans/*.so
+%dir %{ruby_libarchdir}/%{ruby_version}/io
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/io/*.so
 %if %{with batteries}
-%dir %{ruby_libarchdir}/json
-%dir %{ruby_libarchdir}/json/ext
-%attr(755,root,root) %{ruby_libarchdir}/json/ext/*.so
+%dir %{ruby_libarchdir}/%{ruby_version}/json
+%dir %{ruby_libarchdir}/%{ruby_version}/json/ext
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/json/ext/*.so
 %endif
-%dir %{ruby_libarchdir}/mathn
-%attr(755,root,root) %{ruby_libarchdir}/mathn/*.so
-%dir %{ruby_libarchdir}/racc
-%attr(755,root,root) %{ruby_libarchdir}/racc/*.so
-%{ruby_libarchdir}/rbconfig.rb
+%dir %{ruby_libarchdir}/%{ruby_version}/mathn
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/mathn/*.so
+%dir %{ruby_libarchdir}/%{ruby_version}/racc
+%attr(755,root,root) %{ruby_libarchdir}/%{ruby_version}/racc/*.so
+%{ruby_libarchdir}/%{ruby_version}/rbconfig.rb
 
 # parents of gem_dir
 %dir %{_datadir}/%{name}/gems