[rubygems] Try 1.8.5
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Jun 1 15:54:01 UTC 2011
commit 85d6962f79e29a6b71e4ebde5f751badea6e27bf
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Thu Jun 2 00:53:51 2011 +0900
Try 1.8.5
rubygems-1.3.7-noarch-gemdir.patch | 16 ----------
rubygems-1.7.2-fix-gemspec-with-Z-dateformat.patch | 29 -------------------
...gems-1.7.2-read-gemspec-with-Z-dateformat.patch | 25 ----------------
rubygems-1.8.5-noarch-gemdir.patch | 19 ++++++++++++
....8.5-show-extension-build-process-in-sync.patch | 12 ++++----
...ubygems-1.8.5-show-rdoc-process-verbosely.patch | 10 +++---
rubygems.spec | 30 +++++++++----------
7 files changed, 44 insertions(+), 97 deletions(-)
---
diff --git a/rubygems-1.8.5-noarch-gemdir.patch b/rubygems-1.8.5-noarch-gemdir.patch
new file mode 100644
index 0000000..3829a78
--- /dev/null
+++ b/rubygems-1.8.5-noarch-gemdir.patch
@@ -0,0 +1,19 @@
+--- rubygems-1.8.5/lib/rubygems/defaults.rb.noarch 2011-05-19 08:36:37.000000000 +0900
++++ rubygems-1.8.5/lib/rubygems/defaults.rb 2011-06-01 23:46:49.000000000 +0900
+@@ -33,10 +33,12 @@
+ ]
+ else
+ [
+- ConfigMap[:libdir],
+- ruby_engine,
+- 'gems',
+- ConfigMap[:ruby_version]
++ File::expand_path(File::join(ConfigMap[:sitedir],"..","gems")),
++ ConfigMap[:ruby_version]
++# ConfigMap[:libdir],
++# ruby_engine,
++# 'gems',
++# ConfigMap[:ruby_version]
+ ]
+ end
+
diff --git a/rubygems-1.6.0-show-extension-build-process-in-sync.patch b/rubygems-1.8.5-show-extension-build-process-in-sync.patch
similarity index 84%
rename from rubygems-1.6.0-show-extension-build-process-in-sync.patch
rename to rubygems-1.8.5-show-extension-build-process-in-sync.patch
index 2a50034..c715cd7 100644
--- a/rubygems-1.6.0-show-extension-build-process-in-sync.patch
+++ b/rubygems-1.8.5-show-extension-build-process-in-sync.patch
@@ -1,5 +1,5 @@
---- 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
+--- rubygems-1.8.5/lib/rubygems/ext/builder.rb.insync 2011-05-19 07:23:53.000000000 +0900
++++ rubygems-1.8.5/lib/rubygems/ext/builder.rb 2011-06-02 00:09:15.000000000 +0900
@@ -11,6 +11,56 @@
$1.downcase
end
@@ -84,11 +84,11 @@
raise Gem::InstallError, "#{class_name} failed:\n\n#{results.join "\n"}"
end
end
---- 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 @@
+--- rubygems-1.8.5/lib/rubygems/installer.rb.insync 2011-06-01 06:55:13.000000000 +0900
++++ rubygems-1.8.5/lib/rubygems/installer.rb 2011-06-02 00:09:15.000000000 +0900
+@@ -530,7 +530,7 @@
Dir.chdir extension_dir do
- results = builder.build(extension, @gem_dir, dest_path, results)
+ results = builder.build(extension, gem_dir, dest_path, results)
- say results.join("\n") if Gem.configuration.really_verbose
+ # say results.join("\n") if Gem.configuration.really_verbose
diff --git a/rubygems-1.6.0-show-rdoc-process-verbosely.patch b/rubygems-1.8.5-show-rdoc-process-verbosely.patch
similarity index 59%
rename from rubygems-1.6.0-show-rdoc-process-verbosely.patch
rename to rubygems-1.8.5-show-rdoc-process-verbosely.patch
index 9bd15f4..e8d717f 100644
--- a/rubygems-1.6.0-show-rdoc-process-verbosely.patch
+++ b/rubygems-1.8.5-show-rdoc-process-verbosely.patch
@@ -1,5 +1,5 @@
---- 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
+--- rubygems-1.8.5/lib/rubygems/commands/setup_command.rb.rdoc_v 2011-05-26 13:01:53.000000000 +0900
++++ rubygems-1.8.5/lib/rubygems/commands/setup_command.rb 2011-06-02 00:11:14.000000000 +0900
@@ -329,7 +329,8 @@
require 'rdoc/rdoc'
@@ -9,9 +9,9 @@
+ 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
+ args << 'LICENSE.txt' << 'MIT.txt' << 'History.txt'
+--- rubygems-1.8.5/lib/rubygems/doc_manager.rb.rdoc_v 2011-05-19 08:36:37.000000000 +0900
++++ rubygems-1.8.5/lib/rubygems/doc_manager.rb 2011-06-02 00:09:15.000000000 +0900
@@ -165,7 +165,7 @@
args << @spec.require_paths.clone
args << @spec.extra_rdoc_files
diff --git a/rubygems.spec b/rubygems.spec
index af6ad73..0ad03fa 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -6,7 +6,7 @@
%global gem_home %{gem_dir}/%{rb_ver}
%global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
-%global repoid 74619
+%global repoid 74954
# Executing testsuite (enabling %%check section) will cause dependency loop.
# To avoid dependency loop when necessary, please set the following value to 0
@@ -14,25 +14,19 @@
Summary: The Ruby standard for packaging ruby libraries
Name: rubygems
-Version: 1.7.2
-Release: 2%{?dist}
+Version: 1.8.5
+Release: 1%{?dist}
Group: Development/Libraries
-# No GPL version is specified.
-License: Ruby or GPL+
+License: Ruby or MIT
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
+Patch0: rubygems-1.8.5-noarch-gemdir.patch
# Will discuss upstream
# rubygems-Patches-28631
-Patch1: rubygems-1.6.0-show-extension-build-process-in-sync.patch
+Patch1: rubygems-1.8.5-show-extension-build-process-in-sync.patch
# rubygems-Patches-29049
-Patch3: rubygems-1.6.0-show-rdoc-process-verbosely.patch
-# Fix issue for gem containing gemspec file with "invalid" date format
-# generated with psych (ref: bug 706914)
-# Patch from the upstream git
-Patch4: rubygems-1.7.2-fix-gemspec-with-Z-dateformat.patch
-Patch5: rubygems-1.7.2-read-gemspec-with-Z-dateformat.patch
+Patch3: rubygems-1.8.5-show-rdoc-process-verbosely.patch
Requires: ruby(abi) = 1.8
Requires: ruby >= 1.8.7
@@ -58,8 +52,6 @@ libraries.
%patch0 -p1 -b .noarch
%patch1 -p1 -b .insync
%patch3 -p1 -b .rdoc_v
-%patch4 -p1 -b .fixZ
-%patch5 -p1 -b .readZ
# Some of the library files start with #! which rpmlint doesn't like
# and doesn't make much sense
@@ -86,7 +78,10 @@ mkdir -p $RPM_BUILD_ROOT%{gem_home}/{cache,gems,specifications,doc}
%if %{enable_check}
%check
+# Don't use isolate
+sed -i.tmp -e '\@isolate at d' Rakefile
rake test
+mv Rakefile.tmp Rakefile
%endif
%files
@@ -94,7 +89,7 @@ rake test
%doc README*
#%%doc ChangeLog
%doc History.txt
-%doc GPL.txt LICENSE.txt
+%doc MIT.txt LICENSE.txt
%dir %{gem_dir}
%dir %{gem_home}
%dir %{gem_home}/cache
@@ -112,6 +107,9 @@ rake test
%{ruby_sitelib}/ubygems.rb
%changelog
+* Wed Jun 1 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.8.5-1
+- Try 1.8.5
+
* Tue May 24 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.7.2-2
- Handle gemspec file with containing "invalid" date format
generated with psych (ref: bug 706914)
More information about the scm-commits
mailing list