From 0b53e2ac04572f38486c0ca210ef843f1f8abb35 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Thu, 7 Jul 2011 10:02:25 +0200 Subject: Fix rack-test dependencies. --- actionpack-downgrade-dependencies.patch | 29 +++++++++++++++++++++++++++++ rubygem-actionpack.spec | 6 ++++++ 2 files changed, 35 insertions(+) create mode 100644 actionpack-downgrade-dependencies.patch diff --git a/actionpack-downgrade-dependencies.patch b/actionpack-downgrade-dependencies.patch new file mode 100644 index 0000000..1e03123 --- /dev/null +++ b/actionpack-downgrade-dependencies.patch @@ -0,0 +1,29 @@ +--- specifications/actionpack-3.0.9.gemspec.orig ++++ specifications/actionpack-3.0.9.gemspec +@@ -26,7 +26,7 @@ + s.add_runtime_dependency(%q, ["~> 2.1.2"]) + s.add_runtime_dependency(%q, ["~> 0.5.0"]) + s.add_runtime_dependency(%q, [">= 1.2.1"]) +- s.add_runtime_dependency(%q, [">= 0.5.7"]) ++ s.add_runtime_dependency(%q, [">= 0.5.4"]) + s.add_runtime_dependency(%q, [">= 0.6.14"]) + s.add_runtime_dependency(%q, ["~> 0.3.23"]) + s.add_runtime_dependency(%q, ["~> 2.6.6"]) +@@ -36,7 +36,7 @@ + s.add_dependency(%q, ["~> 2.1.2"]) + s.add_dependency(%q, ["~> 0.5.0"]) + s.add_dependency(%q, [">= 1.2.1"]) +- s.add_dependency(%q, [">= 0.5.7"]) ++ s.add_dependency(%q, [">= 0.5.4"]) + s.add_dependency(%q, [">= 0.6.14"]) + s.add_dependency(%q, ["~> 0.3.23"]) + s.add_dependency(%q, ["~> 2.6.6"]) +@@ -47,7 +47,7 @@ + s.add_dependency(%q, ["~> 2.1.2"]) + s.add_dependency(%q, ["~> 0.5.0"]) + s.add_dependency(%q, [">= 1.2.1"]) +- s.add_dependency(%q, [">= 0.5.7"]) ++ s.add_dependency(%q, [">= 0.5.4"]) + s.add_dependency(%q, [">= 0.6.14"]) + s.add_dependency(%q, ["~> 0.3.23"]) + s.add_dependency(%q, ["~> 2.6.6"]) diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec index 0e709ae..9d9e174 100644 --- a/rubygem-actionpack.spec +++ b/rubygem-actionpack.spec @@ -37,6 +37,8 @@ Patch1: actionpack-rakefile-fix.patch # dependency on a file in the greater rails proj Patch2: actionpack-tests-fix.patch +Patch3: actionpack-downgrade-dependencies.patch + Requires: rubygems Requires: rubygem(activesupport) = %{version} Requires: rubygem(activemodel) = %{version} @@ -102,6 +104,10 @@ popd popd +pushd .%{gemdir} +%patch3 -p0 +popd + # Remove backup files # No! these are needed for rake test # find ./%{geminstdir} -type f -name "*~" -delete -- cgit