summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVít Ondruch <vondruch@redhat.com>2013-01-09 16:20:02 +0100
committerVít Ondruch <vondruch@redhat.com>2013-01-09 16:20:18 +0100
commit6224fab5ad6e066d98c3a3e6e8de58f190aec0bb (patch)
treef589278f5daafb3080e6b1fe2a36b7088a2a488e
parent194c6a2f39edc3d6ba7731251665e5718b707bf8 (diff)
downloadrubygem-actionpack-6224fab5ad6e066d98c3a3e6e8de58f190aec0bb.zip
rubygem-actionpack-6224fab5ad6e066d98c3a3e6e8de58f190aec0bb.tar.gz
rubygem-actionpack-6224fab5ad6e066d98c3a3e6e8de58f190aec0bb.tar.xz
Update to the ActionPack 3.2.11.
-rw-r--r--.gitignore2
-rw-r--r--rubygem-actionpack-3.2.8-relax-builder-dependency.patch16
-rw-r--r--rubygem-actionpack-relax-sprockets-dependency.patch4
-rw-r--r--rubygem-actionpack.spec9
-rw-r--r--sources4
5 files changed, 20 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 488811d..1ce5da3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ actionpack-2.3.8.gem
/actionpack-3.2.8.gem
/actionpack-3.2.10-tests.tgz
/actionpack-3.2.10.gem
+/actionpack-3.2.11-tests.tgz
+/actionpack-3.2.11.gem
diff --git a/rubygem-actionpack-3.2.8-relax-builder-dependency.patch b/rubygem-actionpack-3.2.8-relax-builder-dependency.patch
index 604f997..e99986b 100644
--- a/rubygem-actionpack-3.2.8-relax-builder-dependency.patch
+++ b/rubygem-actionpack-3.2.8-relax-builder-dependency.patch
@@ -1,8 +1,8 @@
---- a/specifications/actionpack-3.2.10.gemspec
-+++ b/specifications/actionpack-3.2.10.gemspec
+--- a/specifications/actionpack-3.2.11.gemspec
++++ b/specifications/actionpack-3.2.11.gemspec
@@ -23,7 +23,7 @@
- s.add_runtime_dependency(%q<activesupport>, ["= 3.2.10"])
- s.add_runtime_dependency(%q<activemodel>, ["= 3.2.10"])
+ s.add_runtime_dependency(%q<activesupport>, ["= 3.2.11"])
+ s.add_runtime_dependency(%q<activemodel>, ["= 3.2.11"])
s.add_runtime_dependency(%q<rack-cache>, ["~> 1.2"])
- s.add_runtime_dependency(%q<builder>, ["~> 3.0.0"])
+ s.add_runtime_dependency(%q<builder>, [">= 3.0.0", "< 3.2.0"])
@@ -10,8 +10,8 @@
s.add_runtime_dependency(%q<rack-test>, ["~> 0.6.1"])
s.add_runtime_dependency(%q<journey>, ["~> 1.0.4"])
@@ -34,7 +34,7 @@
- s.add_dependency(%q<activesupport>, ["= 3.2.10"])
- s.add_dependency(%q<activemodel>, ["= 3.2.10"])
+ s.add_dependency(%q<activesupport>, ["= 3.2.11"])
+ s.add_dependency(%q<activemodel>, ["= 3.2.11"])
s.add_dependency(%q<rack-cache>, ["~> 1.2"])
- s.add_dependency(%q<builder>, ["~> 3.0.0"])
+ s.add_dependency(%q<builder>, [">= 3.0.0", "< 3.2.0"])
@@ -19,8 +19,8 @@
s.add_dependency(%q<rack-test>, ["~> 0.6.1"])
s.add_dependency(%q<journey>, ["~> 1.0.4"])
@@ -46,7 +46,7 @@
- s.add_dependency(%q<activesupport>, ["= 3.2.10"])
- s.add_dependency(%q<activemodel>, ["= 3.2.10"])
+ s.add_dependency(%q<activesupport>, ["= 3.2.11"])
+ s.add_dependency(%q<activemodel>, ["= 3.2.11"])
s.add_dependency(%q<rack-cache>, ["~> 1.2"])
- s.add_dependency(%q<builder>, ["~> 3.0.0"])
+ s.add_dependency(%q<builder>, [">= 3.0.0", "< 3.2.0"])
diff --git a/rubygem-actionpack-relax-sprockets-dependency.patch b/rubygem-actionpack-relax-sprockets-dependency.patch
index 8ef6ebc..32e3c53 100644
--- a/rubygem-actionpack-relax-sprockets-dependency.patch
+++ b/rubygem-actionpack-relax-sprockets-dependency.patch
@@ -1,5 +1,5 @@
---- specifications/actionpack-3.2.10.gemspec.old 2012-07-20 12:06:27.000000000 +0200
-+++ specifications/actionpack-3.2.10.gemspec 2012-07-20 12:44:09.491547387 +0200
+--- specifications/actionpack-3.2.11.gemspec.old 2012-07-20 12:06:27.000000000 +0200
++++ specifications/actionpack-3.2.11.gemspec 2012-07-20 12:44:09.491547387 +0200
@@ -27,7 +27,7 @@
s.add_runtime_dependency(%q<rack>, ["~> 1.4.0"])
s.add_runtime_dependency(%q<rack-test>, ["~> 0.6.1"])
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index b5893d8..c87fbd8 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -6,7 +6,7 @@
Summary: Web-flow and rendering framework putting the VC in MVC
Name: rubygem-%{gem_name}
Epoch: 1
-Version: 3.2.10
+Version: 3.2.11
Release: 1%{?dist}
Group: Development/Languages
License: MIT
@@ -17,8 +17,8 @@ Source0: http://rubygems.org/downloads/actionpack-%{version}.gem
# You may check it out like so
# git clone http://github.com/rails/rails.git
# cd rails/actionpack/
-# git checkout v3.2.10
-# tar czvf actionpack-3.2.10-tests.tgz test/
+# git checkout v3.2.11
+# tar czvf actionpack-3.2.11-tests.tgz test/
Source2: actionpack-%{version}-tests.tgz
Patch0: rubygem-actionpack-enable-test.patch
@@ -163,6 +163,9 @@ popd
%{gem_instdir}/test/
%changelog
+* Wed Jan 09 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.11-1
+- Update to the ActionPack 3.2.11.
+
* Thu Jan 03 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.10-1
- Update to the ActionPack 3.2.10.
diff --git a/sources b/sources
index e66fc56..a7e3ba8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2edc5cb98c824ebce90142cf870bc20b actionpack-3.2.10-tests.tgz
-05cd481ea5fb33b0d0153c949d9f2f15 actionpack-3.2.10.gem
+8c801b54bf35b626c94ebe0ddd703a74 actionpack-3.2.11-tests.tgz
+a6cb82fea9bcaf5a356b966189ed9fa5 actionpack-3.2.11.gem