[rubygem-railties] Relax RDoc dependency.
Vít Ondruch
vondruch at fedoraproject.org
Tue Mar 19 14:36:27 UTC 2013
commit a406b57064959e602abdc32603182a6199e3c354
Author: Vít Ondruch <vondruch at redhat.com>
Date: Tue Mar 19 15:36:11 2013 +0100
Relax RDoc dependency.
.gitignore | 2 +
...gem-railties-3.2.12-relax-rdoc-dependency.patch | 16 +++---
...ies-3.2.13-Define-inspect-instead-of-to_s.patch | 35 -------------
...gem-railties-3.2.13-name-should-be-public.patch | 54 --------------------
rubygem-railties.spec | 22 ++-------
sources | 4 +-
6 files changed, 16 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5aae064..07c19fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@
/railties-3.2.11.gem
/railties-3.2.12-tests.tgz
/railties-3.2.12.gem
+/railties-3.2.13-tests.tgz
+/railties-3.2.13.gem
diff --git a/rubygem-railties-3.2.12-relax-rdoc-dependency.patch b/rubygem-railties-3.2.12-relax-rdoc-dependency.patch
index 32c5c8b..8c1e223 100644
--- a/rubygem-railties-3.2.12-relax-rdoc-dependency.patch
+++ b/rubygem-railties-3.2.12-relax-rdoc-dependency.patch
@@ -1,21 +1,21 @@
---- a/specifications/railties-3.2.12.gemspec
-+++ b/specifications/railties-3.2.12.gemspec
+--- a/specifications/railties-3.2.13.gemspec
++++ b/specifications/railties-3.2.13.gemspec
@@ -25,14 +25,14 @@
s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
s.add_runtime_dependency(%q<rack-ssl>, ["~> 1.3.2"])
s.add_runtime_dependency(%q<thor>, ["< 2.0", ">= 0.14.6"])
- s.add_runtime_dependency(%q<rdoc>, ["~> 3.4"])
+ s.add_runtime_dependency(%q<rdoc>, [">= 3.4"])
- s.add_runtime_dependency(%q<activesupport>, ["= 3.2.12"])
- s.add_runtime_dependency(%q<actionpack>, ["= 3.2.12"])
+ s.add_runtime_dependency(%q<activesupport>, ["= 3.2.13"])
+ s.add_runtime_dependency(%q<actionpack>, ["= 3.2.13"])
else
s.add_dependency(%q<rake>, [">= 0.8.7"])
s.add_dependency(%q<rack-ssl>, ["~> 1.3.2"])
s.add_dependency(%q<thor>, ["< 2.0", ">= 0.14.6"])
- s.add_dependency(%q<rdoc>, ["~> 3.4"])
+ s.add_dependency(%q<rdoc>, [">= 3.4"])
- s.add_dependency(%q<activesupport>, ["= 3.2.12"])
- s.add_dependency(%q<actionpack>, ["= 3.2.12"])
+ s.add_dependency(%q<activesupport>, ["= 3.2.13"])
+ s.add_dependency(%q<actionpack>, ["= 3.2.13"])
end
@@ -40,7 +40,7 @@
s.add_dependency(%q<rake>, [">= 0.8.7"])
@@ -23,6 +23,6 @@
s.add_dependency(%q<thor>, ["< 2.0", ">= 0.14.6"])
- s.add_dependency(%q<rdoc>, ["~> 3.4"])
+ s.add_dependency(%q<rdoc>, [">= 3.4"])
- s.add_dependency(%q<activesupport>, ["= 3.2.12"])
- s.add_dependency(%q<actionpack>, ["= 3.2.12"])
+ s.add_dependency(%q<activesupport>, ["= 3.2.13"])
+ s.add_dependency(%q<actionpack>, ["= 3.2.13"])
end
diff --git a/rubygem-railties.spec b/rubygem-railties.spec
index a1c0373..aac5f9b 100644
--- a/rubygem-railties.spec
+++ b/rubygem-railties.spec
@@ -8,8 +8,8 @@
Summary: Tools for creating, working with, and running Rails applications
Name: rubygem-%{gem_name}
-Version: 3.2.12
-Release: 3%{?dist}
+Version: 3.2.13
+Release: 0%{?dist}
Group: Development/Languages
License: MIT
URL: http://www.rubyonrails.org
@@ -19,19 +19,11 @@ Source0: %{download_path}%{gem_name}-%{version}.gem
Source1: http://github.com/rails/rails/raw/master/railties/MIT-LICENSE
# to get tests:
# git clone http://github.com/rails/rails.git && cd rails/railties/
-# git checkout v3.2.12 && tar czvf railties-3.2.12-tests.tgz test/
+# git checkout v3.2.13 && tar czvf railties-3.2.13-tests.tgz test/
Source2: railties-%{version}-tests.tgz
# Rails depends on RDoc ~> 3.4 and upstream doesn't look to go to change it :/
# https://github.com/rails/rails/issues/9634
Patch0: rubygem-railties-3.2.12-relax-rdoc-dependency.patch
-
-# Fixes "name should be public, not private" error.
-# https://github.com/rails/rails/commit/9a0cdc68b5b0fc08e60069cb5512bf2ad6b2a76b
-Patch100: rubygem-railties-3.2.13-name-should-be-public.patch
-# Fixes test_displaying_routes_for_engines(ApplicationTests::RouteInspectTest).
-# https://github.com/rails/rails/commit/45e9cac12ca99a51ef10e5ee423a6712818ae145
-Patch101: rubygem-railties-3.2.13-Define-inspect-instead-of-to_s.patch
-
# Let's keep Requires and BuildRequires sorted alphabeticaly
Requires: ruby(release)
Requires: ruby(rubygems)
@@ -89,10 +81,6 @@ pushd .%{gem_dir}
%patch0 -p1
popd
-pushd .%{gem_instdir}
-%patch100 -p2
-popd
-
# May by only for v.3.0.3-6
#
# Some stylesheet seems to be mistakingly marked as executable in the upstream
@@ -122,11 +110,9 @@ pushd .%{gem_dir}/gems/railties
# extract tests
tar xzf %{SOURCE2}
-cat %{PATCH101} | patch -p2
-
# TODO: Test are not yet in the best state.
ruby -e 'Dir.glob("test/**/*_test.rb").each {|t| require t}' \
- | grep "818 tests, 2034 assertions, 72 failures, 298 errors, 0 skips"
+ | grep "822 tests, 2040 assertions, 71 failures, 299 errors, 0 skips"
popd
%endif
diff --git a/sources b/sources
index 13de532..8badf71 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f10430af0bc95961001bed705ac17527 railties-3.2.12-tests.tgz
-f440ad92aa8ae3afb4836d6c81e3bdcb railties-3.2.12.gem
+da22327ebdd402cca6494bc1cfc1819d railties-3.2.13-tests.tgz
+a3b3a9b20fab562a395ed0e288586171 railties-3.2.13.gem
More information about the scm-commits
mailing list