[rubygem-railties] Relax RDoc dependency.

Vít Ondruch vondruch at fedoraproject.org
Sat Mar 9 21:26:08 UTC 2013


commit 2f4605ae7c2b534525915db60f06034fd1730c16
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Sat Mar 9 22:25:22 2013 +0100

    Relax RDoc dependency.

 ...gem-railties-3.2.12-relax-rdoc-dependency.patch |   28 ++++++++++++++++++++
 rubygem-railties.spec                              |   17 ++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)
---
diff --git a/rubygem-railties-3.2.12-relax-rdoc-dependency.patch b/rubygem-railties-3.2.12-relax-rdoc-dependency.patch
new file mode 100644
index 0000000..32c5c8b
--- /dev/null
+++ b/rubygem-railties-3.2.12-relax-rdoc-dependency.patch
@@ -0,0 +1,28 @@
+--- a/specifications/railties-3.2.12.gemspec
++++ b/specifications/railties-3.2.12.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"])
+     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"])
+     end
+@@ -40,7 +40,7 @@
+     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"])
+   end
diff --git a/rubygem-railties.spec b/rubygem-railties.spec
index b7d3f67..a1c0373 100644
--- a/rubygem-railties.spec
+++ b/rubygem-railties.spec
@@ -9,7 +9,7 @@
 Summary: Tools for creating, working with, and running Rails applications
 Name: rubygem-%{gem_name}
 Version: 3.2.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -21,7 +21,9 @@ Source1: http://github.com/rails/rails/raw/master/railties/MIT-LICENSE
 # 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/
 Source2: railties-%{version}-tests.tgz
-# Let's keep Requires and BuildRequires sorted alphabeticaly
+# 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
@@ -30,6 +32,7 @@ Patch100: rubygem-railties-3.2.13-name-should-be-public.patch
 # 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)
 Requires: rubygem(actionpack) = %{version}
@@ -38,7 +41,8 @@ Requires: rubygem(rake) >= 0.8.7
 Requires: rubygem(rack-ssl) >= 1.3.2
 Requires: rubygem(rack-ssl) < 1.4
 Requires: rubygem(rdoc) >= 3.4
-Requires: rubygem(rdoc) < 4
+# RDoc dependency is relaxed for now. See %%{PATCH0}.
+# Requires: rubygem(rdoc) < 4
 Requires: rubygem(thor) >= 0.14.6
 Requires: rubygem(thor) < 2.0
 BuildRequires: rubygems-devel
@@ -81,6 +85,10 @@ This package contains documentation for %{name}.
 mkdir -p .%{_bindir}
 %gem_install -n %{SOURCE0}
 
+pushd .%{gem_dir}
+%patch0 -p1
+popd
+
 pushd .%{gem_instdir}
 %patch100 -p2
 popd
@@ -139,6 +147,9 @@ popd
 %doc %{gem_instdir}/README.rdoc
 
 %changelog
+* Sat Mar 09 2013 Vít Ondruch <vondruch at redhat.com> - 3.2.12-3
+- Relax RDoc dependency.
+
 * Fri Mar 08 2013 Vít Ondruch <vondruch at redhat.com> - 3.2.12-2
 - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
 


More information about the scm-commits mailing list