From f7fd0b92dc360e0ab52dbbcf6c038e4d776440aa Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Apr 27 2010 18:10:22 +0000
Subject: - Update to 1.3.6

- Show prefix with gem contents by default as shown in --help

---

diff --git a/.cvsignore b/.cvsignore
index 5552275..2f8f041 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rubygems-1.3.5.tgz
+rubygems-1.3.6.tgz
diff --git a/rubygems-1.3.6-show-prefix-with-contents-by-default.patch b/rubygems-1.3.6-show-prefix-with-contents-by-default.patch
new file mode 100644
index 0000000..b6b6148
--- /dev/null
+++ b/rubygems-1.3.6-show-prefix-with-contents-by-default.patch
@@ -0,0 +1,18 @@
+2010-04-21  Eric Hodel  <drbrain@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
+ 
diff --git a/rubygems.spec b/rubygems.spec
index c49ff9e..7c36552 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -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 %{buildroot}/%{_bindir}/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@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@ioa.s.u-tokyo.ac.jp> - 1.3.5-1
 - Update to 1.3.5
 
diff --git a/sources b/sources
index 431d00e..60eee80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e317335898e73beab15623cdd5f8cff  rubygems-1.3.5.tgz
+789ca8e9ad1d4d3fe5f0534fcc038a0d  rubygems-1.3.6.tgz