summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVít Ondruch <vondruch@redhat.com>2011-07-07 10:02:25 +0200
committerVít Ondruch <vondruch@redhat.com>2011-07-07 10:02:25 +0200
commit0b53e2ac04572f38486c0ca210ef843f1f8abb35 (patch)
treedb15bf0a6180cd85135673ab63ce11819462010d
parentffe9fad1d5f35cf7d74fca361dad49df5c0ad5e5 (diff)
downloadrubygem-actionpack-0b53e2ac04572f38486c0ca210ef843f1f8abb35.tar.gz
rubygem-actionpack-0b53e2ac04572f38486c0ca210ef843f1f8abb35.tar.xz
rubygem-actionpack-0b53e2ac04572f38486c0ca210ef843f1f8abb35.zip
Fix rack-test dependencies.
-rw-r--r--actionpack-downgrade-dependencies.patch29
-rw-r--r--rubygem-actionpack.spec6
2 files changed, 35 insertions, 0 deletions
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<builder>, ["~> 2.1.2"])
+ s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
+ s.add_runtime_dependency(%q<rack>, [">= 1.2.1"])
+- s.add_runtime_dependency(%q<rack-test>, [">= 0.5.7"])
++ s.add_runtime_dependency(%q<rack-test>, [">= 0.5.4"])
+ s.add_runtime_dependency(%q<rack-mount>, [">= 0.6.14"])
+ s.add_runtime_dependency(%q<tzinfo>, ["~> 0.3.23"])
+ s.add_runtime_dependency(%q<erubis>, ["~> 2.6.6"])
+@@ -36,7 +36,7 @@
+ s.add_dependency(%q<builder>, ["~> 2.1.2"])
+ s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+ s.add_dependency(%q<rack>, [">= 1.2.1"])
+- s.add_dependency(%q<rack-test>, [">= 0.5.7"])
++ s.add_dependency(%q<rack-test>, [">= 0.5.4"])
+ s.add_dependency(%q<rack-mount>, [">= 0.6.14"])
+ s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
+ s.add_dependency(%q<erubis>, ["~> 2.6.6"])
+@@ -47,7 +47,7 @@
+ s.add_dependency(%q<builder>, ["~> 2.1.2"])
+ s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+ s.add_dependency(%q<rack>, [">= 1.2.1"])
+- s.add_dependency(%q<rack-test>, [">= 0.5.7"])
++ s.add_dependency(%q<rack-test>, [">= 0.5.4"])
+ s.add_dependency(%q<rack-mount>, [">= 0.6.14"])
+ s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
+ s.add_dependency(%q<erubis>, ["~> 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