[rubygems/f15/master] Update to 1.6.1 Patch2, 4 upstreamed

[Mamoru Tasaka]

commit f4fb1cb5c596db896f45191dbec5fa3b3bdd69c4
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Fri Mar 4 17:13:30 2011 +0900

    Update to 1.6.1
    Patch2, 4 upstreamed

 .gitignore                                 |    1 +
 rubygems-1.6.0-aviod-cache-cache-dir.patch |   11 ------
 rubygems-1.6.0-test-under-umask.patch      |   47 ----------------------------
 rubygems.spec                              |   14 +++-----
 sources                                    |    2 +-
 5 files changed, 8 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bade2a6..6dd7ee8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ rubygems-1.3.7.tgz
 /rubygems-1.5.2.tgz
 /rubygems-1.5.3.tgz
 /rubygems-1.6.0.tgz
+/rubygems-1.6.1.tgz
diff --git a/rubygems.spec b/rubygems.spec
index 2866dac..8bb96ec 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -3,7 +3,7 @@
 %global	gem_home	%{gem_dir}/%{rb_ver}
 %global	ruby_sitelib	%(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
-%global	repoid		74374
+%global	repoid		74388
 
 # Executing testsuite (enabling %%check section) will cause dependency loop.
 # To avoid dependency loop when necessary, please set the following value to 0
@@ -11,7 +11,7 @@
 
 Summary:	The Ruby standard for packaging ruby libraries
 Name:		rubygems
-Version:	1.6.0
+Version:	1.6.1
 Release:	1%{?dist}
 Group:		Development/Libraries
 # No GPL version is specified.
@@ -23,12 +23,8 @@ Patch0:		rubygems-1.3.7-noarch-gemdir.patch
 # Will discuss upstream
 # rubygems-Patches-28631
 Patch1:		rubygems-1.6.0-show-extension-build-process-in-sync.patch
-# rubygems-Bugs-29050
-Patch2:		rubygems-1.6.0-test-under-umask.patch
 # rubygems-Patches-29049
 Patch3:		rubygems-1.6.0-show-rdoc-process-verbosely.patch
-# rubygem-Bugs-29051
-Patch4:		rubygems-1.6.0-aviod-cache-cache-dir.patch
 
 Requires:	ruby(abi) = 1.8
 Requires:	ruby >= 1.8.7
@@ -53,9 +49,7 @@ libraries.
 %setup -q
 %patch0 -p1 -b .noarch
 %patch1 -p1 -b .insync
-%patch2 -p1 -b .umask
 %patch3 -p1 -b .rdoc_v
-%patch4 -p1 -b .cachedir
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -108,6 +102,10 @@ rake test
 %{ruby_sitelib}/ubygems.rb
 
 %changelog
+* Fri Mar  4 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.6.1-1
+- Update to 1.6.1
+- Patch2, 4 upstreamed
+
 * Thu Mar  3 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.6.0-1
 - Update to 1.6.0
 
diff --git a/sources b/sources
index 8623236..7aeb411 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abd27b5a9002100ff74ddb398a1c9689  rubygems-1.6.0.tgz
+a77c64896aaa10d64aaf34f5c1488173  rubygems-1.6.1.tgz