summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVít Ondruch <vondruch@redhat.com>2011-07-04 15:49:16 +0200
committerVít Ondruch <vondruch@redhat.com>2011-07-04 15:49:16 +0200
commita76d6e608ce290050c7964f2925a5549616b7c94 (patch)
tree10a684ad7910f88ae74d6e7e2ae68a5bc8b76766
parent54819ad064512cdff4a74c9b10bed86daefeb775 (diff)
downloadrubygem-activerecord-a76d6e608ce290050c7964f2925a5549616b7c94.tar.gz
rubygem-activerecord-a76d6e608ce290050c7964f2925a5549616b7c94.tar.xz
rubygem-activerecord-a76d6e608ce290050c7964f2925a5549616b7c94.zip
Downgraded arel dependency.
-rw-r--r--activerecord-downgrade-dependencies.patch24
-rw-r--r--rubygem-activerecord.spec6
2 files changed, 30 insertions, 0 deletions
diff --git a/activerecord-downgrade-dependencies.patch b/activerecord-downgrade-dependencies.patch
new file mode 100644
index 0000000..faa704b
--- /dev/null
+++ b/activerecord-downgrade-dependencies.patch
@@ -0,0 +1,24 @@
+--- specifications/activerecord-3.0.9.gemspec.orig
++++ specifications/activerecord-3.0.9.gemspec
+@@ -25,18 +25,18 @@
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ s.add_runtime_dependency(%q<activesupport>, ["= 3.0.9"])
+ s.add_runtime_dependency(%q<activemodel>, ["= 3.0.9"])
+- s.add_runtime_dependency(%q<arel>, ["~> 2.0.10"])
++ s.add_runtime_dependency(%q<arel>, ["~> 2.0.9"])
+ s.add_runtime_dependency(%q<tzinfo>, ["~> 0.3.23"])
+ else
+ s.add_dependency(%q<activesupport>, ["= 3.0.9"])
+ s.add_dependency(%q<activemodel>, ["= 3.0.9"])
+- s.add_dependency(%q<arel>, ["~> 2.0.10"])
++ s.add_dependency(%q<arel>, ["~> 2.0.9"])
+ s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
+ end
+ else
+ s.add_dependency(%q<activesupport>, ["= 3.0.9"])
+ s.add_dependency(%q<activemodel>, ["= 3.0.9"])
+- s.add_dependency(%q<arel>, ["~> 2.0.10"])
++ s.add_dependency(%q<arel>, ["~> 2.0.9"])
+ s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
+ end
+ end
diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec
index 42261c3..02faf0b 100644
--- a/rubygem-activerecord.spec
+++ b/rubygem-activerecord.spec
@@ -35,6 +35,8 @@ Patch0: activerecord-rakefile-fix.patch
# dependency on a file in the greater rails proj
Patch1: activerecord-tests-fix.patch
+Patch2: activerecord-downgrade-dependencies.patch
+
Requires: ruby(abi) = %{rubyabi}
Requires: rubygems
Requires: rubygem(activesupport) = %{version}
@@ -82,6 +84,10 @@ pushd ./%{geminstdir}
%patch1 -p0
popd
+pushd .%{gemdir}
+%patch2 -p0
+popd
+
# Remove backup files
find ./%{geminstdir} -type f -name "*~" -delete