packages: ruby/ruby.spec - unified macros in files paths - build with batte...

[qboosh]

Author: qboosh                       Date: Sat Sep 18 15:53:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unified macros in files paths
- build with batteries Obsoletes: ruby-{json,rake,rubygems}

---- Files affected:
packages/ruby:
   ruby.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: packages/ruby/ruby.spec
diff -u packages/ruby/ruby.spec:1.217 packages/ruby/ruby.spec:1.218
--- packages/ruby/ruby.spec:1.217	Sat Sep 18 11:27:48 2010
+++ packages/ruby/ruby.spec	Sat Sep 18 17:53:44 2010
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	doc	# skip generating docs (which is time-consuming). Intended for speed up test builds
+%bcond_without	doc	# skip (time-consuming) docs generating; intended for speed up test builds
 %bcond_without	emacs	# skip building package with ruby-mode for emacs
 %bcond_without	tk	# skip building package with Tk bindings
-%bcond_without  batteries # Don't include rubygems, json or rake
+%bcond_without  batteries	# Don't include rubygems, json or rake
 #
 %define		ruby_ver	1.9
 %define		stdlibdoc_version	0.10.1
@@ -53,6 +53,11 @@
 Obsoletes:	ruby-REXML
 Obsoletes:	ruby-doc < 1.8.4
 Obsoletes:	ruby-fastthread
+%if %{with batteries}
+Obsoletes:	ruby-json
+Obsoletes:	ruby-rake
+Obsoletes:	ruby-rubygems
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # bleh, some nasty (gcc or ruby) bug still not fixed
@@ -324,8 +329,6 @@
 %{_libdir}/%{name}/%{ruby_ver}/date
 %{_libdir}/%{name}/%{ruby_ver}/digest
 %{_libdir}/%{name}/%{ruby_ver}/dl
-%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/dl
-%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/dl/callback.so
 %{_libdir}/%{name}/%{ruby_ver}/drb
 %{_libdir}/%{name}/%{ruby_ver}/irb
 %{_libdir}/%{name}/%{ruby_ver}/minitest
@@ -361,35 +364,39 @@
 %{_libdir}/%{name}/%{ruby_ver}/tracer.rb
 %{_libdir}/%{name}/%{ruby_ver}/tsort.rb
 %{_libdir}/%{name}/%{ruby_ver}/[u-z]*.rb
+%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/[a-s]*.so
+%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/[u-z]*.so
 %dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/digest
+%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/digest/*.so
+%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/dl
+%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/dl/callback.so
 %dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/enc
+%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/enc/*.so
 %dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/enc/trans
+%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/enc/trans/*.so
 %dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/io
+%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/io/*.so
 %if %{with batteries}
 %dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/json
 %dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/json/ext
-%attr(755,root,root) %{ruby_archdir}/json/ext/*.so
+%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/json/ext/*.so
 %endif
 %dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/mathn
-%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/racc
-%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/[a-s]*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/[u-z]*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/digest/*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/enc/*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/enc/trans/*.so
-%attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/io/*.so
 %attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/mathn/*.so
+%dir %{_libdir}/%{name}/%{ruby_ver}/*-linux*/racc
 %attr(755,root,root) %{_libdir}/%{name}/%{ruby_ver}/*-linux*/racc/*.so
 %{_libdir}/%{name}/%{ruby_ver}/*-linux*/rbconfig.rb
+%dir %{_libdir}/%{name}/gems
+%dir %{_libdir}/%{name}/gems/%{ruby_ver}
+%dir %{_libdir}/%{name}/gems/%{ruby_ver}/specifications
+%{_libdir}/%{name}/gems/%{ruby_ver}/specifications/minitest.gemspec
+%{_libdir}/%{name}/gems/%{ruby_ver}/specifications/rake.gemspec
+%{_libdir}/%{name}/gems/%{ruby_ver}/specifications/rdoc.gemspec
 %{_mandir}/man1/erb.1*
 %{_mandir}/man1/irb.1*
 %{_mandir}/man1/rdoc.1*
 %{_mandir}/man1/ri.1*
 %{_mandir}/man1/testrb.1*
-%attr(755,root,root) %{ruby_archdir}/dl/callback.so
-%{_libdir}/ruby/gems/1.9/specifications/minitest.gemspec
-%{_libdir}/ruby/gems/1.9/specifications/rake.gemspec
-%{_libdir}/ruby/gems/1.9/specifications/rdoc.gemspec
 
 %files doc
 %defattr(644,root,root,755)
@@ -421,6 +428,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2010/09/18 15:53:44  qboosh
+- unified macros in files paths
+- build with batteries Obsoletes: ruby-{json,rake,rubygems}
+
 Revision 1.217  2010/09/18 09:27:48  qboosh
 - ac version
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby/ruby.spec?r1=1.217&r2=1.218&f=u