[rubygems/f15/master] Update to 1.6.0
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Mar 2 19:52:45 UTC 2011
commit e1c91ca8864067dffc8fe420ae14cd872d9c15b3
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Thu Mar 3 04:52:36 2011 +0900
Update to 1.6.0
.gitignore | 1 +
rubygems-1.5.2-show-rdoc-process-verbosely.patch | 22 -------------------
rubygems-1.6.0-aviod-cache-cache-dir.patch | 11 +++++++++
....6.0-show-extension-build-process-in-sync.patch | 10 ++++----
rubygems-1.6.0-show-rdoc-process-verbosely.patch | 23 ++++++++++++++++++++
....patch => rubygems-1.6.0-test-under-umask.patch | 22 +++++++++---------
rubygems.spec | 18 ++++++++++-----
sources | 2 +-
8 files changed, 64 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d371e4a..bade2a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ rubygems-1.3.7.tgz
/rubygems-1.5.0.tgz
/rubygems-1.5.2.tgz
/rubygems-1.5.3.tgz
+/rubygems-1.6.0.tgz
diff --git a/rubygems-1.6.0-aviod-cache-cache-dir.patch b/rubygems-1.6.0-aviod-cache-cache-dir.patch
new file mode 100644
index 0000000..0634fd8
--- /dev/null
+++ b/rubygems-1.6.0-aviod-cache-cache-dir.patch
@@ -0,0 +1,11 @@
+--- rubygems-1.6.0/lib/rubygems/dependency_installer.rb.cachedir 2011-03-02 08:40:03.000000000 +0900
++++ rubygems-1.6.0/lib/rubygems/dependency_installer.rb 2011-03-03 04:37:42.000000000 +0900
+@@ -68,7 +68,7 @@
+ @installed_gems = []
+
+ @install_dir = options[:install_dir] || Gem.dir
+- @cache_dir = options[:cache_dir] || Gem.cache_dir(@install_dir)
++ @cache_dir = options[:cache_dir] || @install_dir #Gem.cache_dir(@install_dir)
+
+ # Set with any errors that SpecFetcher finds while search through
+ # gemspecs for a dep
diff --git a/rubygems-1.5.0-show-extension-build-process-in-sync.patch b/rubygems-1.6.0-show-extension-build-process-in-sync.patch
similarity index 88%
rename from rubygems-1.5.0-show-extension-build-process-in-sync.patch
rename to rubygems-1.6.0-show-extension-build-process-in-sync.patch
index 60eea1a..2a50034 100644
--- a/rubygems-1.5.0-show-extension-build-process-in-sync.patch
+++ b/rubygems-1.6.0-show-extension-build-process-in-sync.patch
@@ -1,5 +1,5 @@
---- rubygems-1.5.0/lib/rubygems/ext/builder.rb.insync 2011-01-29 05:18:10.000000000 +0900
-+++ rubygems-1.5.0/lib/rubygems/ext/builder.rb 2011-02-11 05:46:38.000000000 +0900
+--- rubygems-1.6.0/lib/rubygems/ext/builder.rb.insync 2011-01-29 05:18:10.000000000 +0900
++++ rubygems-1.6.0/lib/rubygems/ext/builder.rb 2011-03-03 03:34:48.000000000 +0900
@@ -11,6 +11,56 @@
$1.downcase
end
@@ -84,9 +84,9 @@
raise Gem::InstallError, "#{class_name} failed:\n\n#{results.join "\n"}"
end
end
---- rubygems-1.5.0/lib/rubygems/installer.rb.insync 2011-02-01 09:08:02.000000000 +0900
-+++ rubygems-1.5.0/lib/rubygems/installer.rb 2011-02-10 23:13:20.000000000 +0900
-@@ -508,7 +508,7 @@
+--- rubygems-1.6.0/lib/rubygems/installer.rb.insync 2011-03-02 08:40:03.000000000 +0900
++++ rubygems-1.6.0/lib/rubygems/installer.rb 2011-03-03 03:34:48.000000000 +0900
+@@ -512,7 +512,7 @@
Dir.chdir extension_dir do
results = builder.build(extension, @gem_dir, dest_path, results)
diff --git a/rubygems-1.6.0-show-rdoc-process-verbosely.patch b/rubygems-1.6.0-show-rdoc-process-verbosely.patch
new file mode 100644
index 0000000..9bd15f4
--- /dev/null
+++ b/rubygems-1.6.0-show-rdoc-process-verbosely.patch
@@ -0,0 +1,23 @@
+--- rubygems-1.6.0/lib/rubygems/commands/setup_command.rb.debug 2011-03-02 08:40:03.000000000 +0900
++++ rubygems-1.6.0/lib/rubygems/commands/setup_command.rb 2011-03-03 03:24:09.000000000 +0900
+@@ -329,7 +329,8 @@
+
+ require 'rdoc/rdoc'
+
+- args << '--main' << 'README.rdoc' << '--quiet'
++ args << '--main' << 'README.rdoc'
++ args << '--quiet' unless Gem.configuration.really_verbose
+ args << '.'
+ args << 'README.rdoc' << 'UPGRADING.rdoc'
+ args << 'LICENSE.txt' << 'GPL.txt' << 'History.txt'
+--- rubygems-1.6.0/lib/rubygems/doc_manager.rb.debug 2011-03-02 08:40:03.000000000 +0900
++++ rubygems-1.6.0/lib/rubygems/doc_manager.rb 2011-03-03 03:23:29.000000000 +0900
+@@ -165,7 +165,7 @@
+ args << @spec.require_paths.clone
+ args << @spec.extra_rdoc_files
+ args << '--title' << "#{@spec.full_name} Documentation"
+- args << '--quiet'
++ args << '--quiet' unless Gem.configuration.really_verbose
+ args = args.flatten.map do |arg| arg.to_s end
+
+ if self.class.rdoc_version >= Gem::Version.new('2.4.0') then
diff --git a/rubygems-1.5.0-test-under-umask.patch b/rubygems-1.6.0-test-under-umask.patch
similarity index 76%
rename from rubygems-1.5.0-test-under-umask.patch
rename to rubygems-1.6.0-test-under-umask.patch
index d25d504..a911a52 100644
--- a/rubygems-1.5.0-test-under-umask.patch
+++ b/rubygems-1.6.0-test-under-umask.patch
@@ -1,42 +1,42 @@
---- rubygems-1.5.0/test/rubygems/test_gem_installer.rb.umask 2011-01-29 06:52:19.000000000 +0900
-+++ rubygems-1.5.0/test/rubygems/test_gem_installer.rb 2011-02-11 04:30:12.000000000 +0900
-@@ -180,7 +180,7 @@
+--- rubygems-1.6.0/test/rubygems/test_gem_installer.rb.umask 2011-03-02 08:40:03.000000000 +0900
++++ rubygems-1.6.0/test/rubygems/test_gem_installer.rb 2011-03-03 03:36:01.000000000 +0900
+@@ -181,7 +181,7 @@
assert_equal true, File.directory?(util_inst_bindir)
- installed_exec = File.join(util_inst_bindir, "my_exec")
+ installed_exec = File.join(util_inst_bindir, 'executable')
assert_equal true, File.exist?(installed_exec)
- assert_equal(0100755, File.stat(installed_exec).mode) unless win_platform?
+ assert_equal(( 0100755 & (~ File.umask)), File.stat(installed_exec).mode) unless win_platform?
wrapper = File.read installed_exec
assert_match %r|generated by RubyGems|, wrapper
-@@ -195,7 +195,7 @@
+@@ -196,7 +196,7 @@
assert_equal true, File.directory?(util_inst_bindir)
- installed_exec = File.join(util_inst_bindir, "my_exec")
+ installed_exec = File.join(util_inst_bindir, 'executable')
assert_equal true, File.exist?(installed_exec)
- assert_equal(0100755, File.stat(installed_exec).mode) unless win_platform?
+ assert_equal(( 0100755 & (~ File.umask)), File.stat(installed_exec).mode) unless win_platform?
wrapper = File.read installed_exec
assert_match %r|generated by RubyGems|, wrapper
-@@ -248,7 +248,7 @@
+@@ -249,7 +249,7 @@
- installed_exec = File.join("#{@gemhome}2", 'bin', 'my_exec')
+ installed_exec = File.join("#{@gemhome}2", 'bin', 'executable')
assert_equal true, File.exist?(installed_exec)
- assert_equal(0100755, File.stat(installed_exec).mode) unless win_platform?
+ assert_equal(( 0100755 & (~ File.umask)), File.stat(installed_exec).mode) unless win_platform?
wrapper = File.read installed_exec
assert_match %r|generated by RubyGems|, wrapper
-@@ -294,7 +294,7 @@
+@@ -298,7 +298,7 @@
- installed_exec = File.join @gemhome, 'bin', 'my_exec'
+ installed_exec = File.join @gemhome, 'bin', 'executable'
assert_equal true, File.exist?(installed_exec)
- assert_equal 0100755, File.stat(installed_exec).mode unless win_platform?
+ assert_equal ( 0100755 & (~ File.umask)), File.stat(installed_exec).mode unless win_platform?
wrapper = File.read installed_exec
assert_match %r|generated by RubyGems|, wrapper
-@@ -319,7 +319,7 @@
+@@ -323,7 +323,7 @@
@installer.generate_bin
assert_equal true, File.directory?(util_inst_bindir)
assert_equal true, File.exist?(installed_exec)
diff --git a/rubygems.spec b/rubygems.spec
index 34c4754..ac29ddd 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 74343
+%global repoid 74374
# 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.5.3
+Version: 1.6.0
Release: 1%{?dist}
Group: Development/Libraries
# No GPL version is specified.
@@ -21,9 +21,10 @@ URL: http://rubyforge.org/projects/rubygems/
Source0: http://rubyforge.org/frs/download.php/%{repoid}/rubygems-%{version}.tgz
Patch0: rubygems-1.3.7-noarch-gemdir.patch
# Will discuss upstream
-Patch1: rubygems-1.5.0-show-extension-build-process-in-sync.patch
-Patch2: rubygems-1.5.0-test-under-umask.patch
-Patch3: rubygems-1.5.2-show-rdoc-process-verbosely.patch
+Patch1: rubygems-1.6.0-show-extension-build-process-in-sync.patch
+Patch2: rubygems-1.6.0-test-under-umask.patch
+Patch3: rubygems-1.6.0-show-rdoc-process-verbosely.patch
+Patch4: rubygems-1.6.0-aviod-cache-cache-dir.patch
Requires: ruby(abi) = 1.8
Requires: ruby >= 1.8.7
@@ -50,6 +51,7 @@ libraries.
%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
@@ -81,7 +83,8 @@ rake test
%files
%defattr(-, root, root, -)
-%doc README* ChangeLog
+%doc README*
+#%%doc ChangeLog
%doc History.txt
%doc GPL.txt LICENSE.txt
%dir %{gem_dir}
@@ -101,6 +104,9 @@ rake test
%{ruby_sitelib}/ubygems.rb
%changelog
+* Thu Mar 3 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.6.0-1
+- Update to 1.6.0
+
* Sun Feb 27 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.5.3-1
- Update to 1.5.3
diff --git a/sources b/sources
index bbfb192..8623236 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38bbbdc17aef923fb41f054cf8421116 rubygems-1.5.3.tgz
+abd27b5a9002100ff74ddb398a1c9689 rubygems-1.6.0.tgz
More information about the scm-commits
mailing list