[packages/ruby-rails] - fix bogus rdoc deps

baggins baggins at pld-linux.org
Thu Sep 4 20:53:41 CEST 2014


commit 3f83c9fd21caaf966ae1e8f41ecc754140aef4da
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Sep 4 20:34:48 2014 +0200

    - fix bogus rdoc deps

 bogus-deps.patch | 11 +++++++++++
 ruby-rails.spec  | 16 +++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/ruby-rails.spec b/ruby-rails.spec
index 7f27d0f..600c6e5 100644
--- a/ruby-rails.spec
+++ b/ruby-rails.spec
@@ -4,7 +4,7 @@
 Summary:	Web-application framework with template engine, control-flow layer, and ORM
 Name:		ruby-%{pkgname}
 Version:	3.2.19
-Release:	0.2
+Release:	0.3
 License:	MIT
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/railties-%{version}.gem
@@ -14,6 +14,7 @@ Source1:	http://rubygems.org/downloads/rails-%{version}.gem
 URL:		http://www.rubyonrails.org/
 Patch0:		system-bundle.patch
 Patch1:		disable-sprockets.patch
+Patch2:		bogus-deps.patch
 BuildRequires:	rpmbuild(macros) >= 1.277
 BuildRequires:	ruby-bundler >= 1.0.3
 BuildRequires:	ruby-modules >= 1.9.2
@@ -124,6 +125,13 @@ install -d railgem
 %patch0 -p1
 %patch1 -p1
 
+# write .gemspec
+cd railgem
+%__gem_helper spec
+cd ..
+%__gem_helper spec
+%patch2 -p1
+
 find -newer README.rdoc -o -print | xargs touch --reference %{SOURCE0}
 
 %{__grep} -rl '/usr/bin/env' . | xargs %{__sed} -i -e '
@@ -136,12 +144,6 @@ find -newer README.rdoc -o -print | xargs touch --reference %{SOURCE0}
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
-# write .gemspec
-cd railgem
-%__gem_helper spec
-cd ..
-%__gem_helper spec
-
 %{__sed} -i -e 's/\(.*s.add_dependency.*rdoc.*\)~>\(.*3.4.*\)/\1>\2/g' \
 	railties*.gemspec
 
diff --git a/bogus-deps.patch b/bogus-deps.patch
new file mode 100644
index 0000000..f983674
--- /dev/null
+++ b/bogus-deps.patch
@@ -0,0 +1,11 @@
+--- rails-3.2.19/railties-3.2.19.gemspec~	2014-09-04 20:33:32.000000000 +0200
++++ rails-3.2.19/railties-3.2.19.gemspec	2014-09-04 20:33:57.044760379 +0200
+@@ -26,7 +26,7 @@
+       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.19"])
+       s.add_runtime_dependency(%q<actionpack>, ["= 3.2.19"])
+     else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-rails.git/commitdiff/58e11fa52344f8235f6a936fd39368a77270b84f



More information about the pld-cvs-commit mailing list