rpms/rubygems/F-12 rubygems-1.3.6-show-prefix-with-contents-by-default.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 rubygems.spec, 1.11, 1.12 sources, 1.8, 1.9

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/rubygems/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14418/F-12

Modified Files:
	.cvsignore rubygems.spec sources 
Added Files:
	rubygems-1.3.6-show-prefix-with-contents-by-default.patch 
Log Message:
* Wed Feb 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.6-1
- Update to 1.3.6
- Show prefix with gem contents by default as shown in --help


rubygems-1.3.6-show-prefix-with-contents-by-default.patch:
 contents_command.rb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rubygems-1.3.6-show-prefix-with-contents-by-default.patch ---
2010-04-21  Eric Hodel  <drbrain at segment7.net>

	* lib/rubygems/commands/contents_command.rb:  Make --prefix the
	  default as specified in --help.  Bug #27211 by Mamoru Tasaka.

Index: trunk/lib/rubygems/commands/contents_command.rb
===================================================================
--- trunk/lib/rubygems/commands/contents_command.rb	(revision 2496)
+++ trunk/lib/rubygems/commands/contents_command.rb	(revision 2497)
@@ -7,7 +7,7 @@
 
   def initialize
     super 'contents', 'Display the contents of the installed gems',
-          :specdirs => [], :lib_only => false
+          :specdirs => [], :lib_only => false, :prefix => true
 
     add_version_option
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 16:40:31 -0000	1.8
+++ .cvsignore	27 Apr 2010 18:10:20 -0000	1.9
@@ -1 +1 @@
-rubygems-1.3.5.tgz
+rubygems-1.3.6.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/F-12/rubygems.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygems.spec	20 Sep 2009 16:40:31 -0000	1.11
+++ rubygems.spec	27 Apr 2010 18:10:21 -0000	1.12
@@ -3,11 +3,11 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
-%define repoid 60718
+%define repoid 69365
 
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 1.3.5
+Version: 1.3.6
 Release: 1%{?dist}
 Group: Development/Libraries
 # No GPL version is specified.
@@ -15,6 +15,8 @@ License: Ruby or GPL+
 URL: http://rubyforge.org/projects/rubygems/
 Source0: http://rubyforge.org/frs/download.php/%{repoid}/rubygems-%{version}.tgz
 Patch0: rubygems-1.3.5-noarch-gemdir.patch
+# Upstream bug 27211
+Patch1: rubygems-1.3.6-show-prefix-with-contents-by-default.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 Requires: ruby(abi) = 1.8 ruby-rdoc
 BuildRequires:  ruby ruby-rdoc
@@ -28,6 +30,7 @@ libraries.
 %prep
 %setup -q
 %patch0 -p1 -b .noarch
+%patch1 -p1 -b .prefix_contents
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -50,6 +53,10 @@ mv %{buildroot}/%{ruby_sitelib}/bin/gem 
 rm -rf %{buildroot}/%{ruby_sitelib}/bin
 mv %{buildroot}/%{ruby_sitelib}/lib/* %{buildroot}/%{ruby_sitelib}/.
 
+# FIXME!!
+mkdir -p $RPM_BUILD_ROOT%{gem_home}/{cache,gems,specifications,doc}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/*
 
 %changelog
+* Wed Feb 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.6-1
+- Update to 1.3.6
+- Show prefix with gem contents by default as shown in --help
+
 * Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.5-1
 - Update to 1.3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 16:40:31 -0000	1.8
+++ sources	27 Apr 2010 18:10:21 -0000	1.9
@@ -1 +1 @@
-6e317335898e73beab15623cdd5f8cff  rubygems-1.3.5.tgz
+789ca8e9ad1d4d3fe5f0534fcc038a0d  rubygems-1.3.6.tgz