packages: ruby/ruby.spec - rel 4 - package minitest here, obsolete ruby-min...

[baggins]

Author: baggins                      Date: Sun Mar 13 16:44:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- package minitest here, obsolete ruby-minitest package
  see https://bugs.launchpad.net/pld-linux/+bug/734340

---- Files affected:
packages/ruby:
   ruby.spec (1.223 -> 1.224) 

---- Diffs:

================================================================
Index: packages/ruby/ruby.spec
diff -u packages/ruby/ruby.spec:1.223 packages/ruby/ruby.spec:1.224
--- packages/ruby/ruby.spec:1.223	Sun Jan 30 18:55:38 2011
+++ packages/ruby/ruby.spec	Sun Mar 13 17:44:26 2011
@@ -17,7 +17,7 @@
 Summary(zh_CN.UTF-8):	ruby - 一种快速高效的面向对象脚本编程语言
 Name:		ruby
 Version:	%{basever}.%{patchlevel}
-Release:	3
+Release:	4
 Epoch:		1
 License:	The Ruby License
 Group:		Development/Languages
@@ -105,6 +105,7 @@
 Group:		Development/Languages
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	ruby-modules(ver) = %{ruby_ver}
+Obsoletes:	ruby-minitest
 
 %description modules
 Ruby standard modules and utilities:
@@ -246,7 +247,7 @@
 
 %if %{without batteries}
 # packaged separately
-rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/%{ruby_ver}/{rubygems,rake,json,minitest}
+rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/%{ruby_ver}/{rubygems,rake,json}
 rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/%{ruby_ver}/*-linux*/json
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/%{ruby_ver}/{rake,rubygems,json}.rb
 rm $RPM_BUILD_ROOT%{_bindir}/{gem,rake}
@@ -335,12 +336,12 @@
 %{_libdir}/%{name}/%{ruby_ver}/drb
 %{_libdir}/%{name}/%{ruby_ver}/fiddle
 %{_libdir}/%{name}/%{ruby_ver}/irb
+%{_libdir}/%{name}/%{ruby_ver}/minitest
 %{_libdir}/%{name}/%{ruby_ver}/net
 %{_libdir}/%{name}/%{ruby_ver}/openssl
 %{_libdir}/%{name}/%{ruby_ver}/optparse
 %if %{with batteries}
 %{_libdir}/%{name}/%{ruby_ver}/json
-%{_libdir}/%{name}/%{ruby_ver}/minitest
 %{_libdir}/%{name}/%{ruby_ver}/rake
 %{_libdir}/%{name}/%{ruby_ver}/rubygems
 %endif
@@ -393,7 +394,6 @@
 %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*
@@ -432,6 +432,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.224  2011/03/13 16:44:26  baggins
+- rel 4
+- package minitest here, obsolete ruby-minitest package
+  see https://bugs.launchpad.net/pld-linux/+bug/734340
+
 Revision 1.223  2011/01/30 17:55:38  charles
 - BR: libffi-devel
 
================================================================

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