From 179fcd084952bdb0f1d8a6cc6f227a158fba891a Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Sat, 13 Oct 2012 16:33:39 +0200
Subject: Relaxed Builder dependency.

---
 ...actionpack-3.2.8-relax-builder-dependency.patch | 30 ++++++++++++++++++++++
 rubygem-actionpack.spec                            | 13 +++++++---
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 rubygem-actionpack-3.2.8-relax-builder-dependency.patch

diff --git a/rubygem-actionpack-3.2.8-relax-builder-dependency.patch b/rubygem-actionpack-3.2.8-relax-builder-dependency.patch
new file mode 100644
index 0000000..01977e6
--- /dev/null
+++ b/rubygem-actionpack-3.2.8-relax-builder-dependency.patch
@@ -0,0 +1,30 @@
+--- a/specifications/actionpack-3.2.8.gemspec
++++ b/specifications/actionpack-3.2.8.gemspec
+@@ -23,7 +23,7 @@
+       s.add_runtime_dependency(%q<activesupport>, ["= 3.2.8"])
+       s.add_runtime_dependency(%q<activemodel>, ["= 3.2.8"])
+       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"])
+       s.add_runtime_dependency(%q<rack>, ["~> 1.4.0"])
+       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.8"])
+       s.add_dependency(%q<activemodel>, ["= 3.2.8"])
+       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"])
+       s.add_dependency(%q<rack>, ["~> 1.4.0"])
+       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.8"])
+     s.add_dependency(%q<activemodel>, ["= 3.2.8"])
+     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"])
+     s.add_dependency(%q<rack>, ["~> 1.4.0"])
+     s.add_dependency(%q<rack-test>, ["~> 0.6.1"])
+     s.add_dependency(%q<journey>, ["~> 1.0.4"])
+
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index dfd3ceb..6b1f212 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -7,7 +7,7 @@ Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gem_name}
 Epoch: 1
 Version: 3.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -21,15 +21,16 @@ Source0: http://rubygems.org/downloads/actionpack-%{version}.gem
 # tar czvf actionpack-3.2.8-tests.tgz test/
 Source2: actionpack-%{version}-tests.tgz
 
-Patch0:  rubygem-actionpack-enable-test.patch
-Patch1:  rubygem-actionpack-relax-sprockets-dependency.patch
+Patch0: rubygem-actionpack-enable-test.patch
+Patch1: rubygem-actionpack-relax-sprockets-dependency.patch
+Patch2: rubygem-actionpack-3.2.8-relax-builder-dependency.patch
 
 # Let's keep Requires and BuildRequires sorted alphabeticaly
 Requires: ruby(rubygems)
 Requires: rubygem(activemodel) = %{version}
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(builder) >= 3.0.0
-Requires: rubygem(builder) < 3.1
+Requires: rubygem(builder) < 3.2
 Requires: rubygem(erubis) >= 2.7.0
 Requires: rubygem(erubis) < 2.8
 Requires: rubygem(journey) >= 1.0.4
@@ -96,6 +97,7 @@ popd
 
 pushd .%{gem_dir}
 %patch1 -p0
+%patch2 -p1
 popd
 
 # Remove backup files
@@ -157,6 +159,9 @@ popd
 %{gem_instdir}/test/
 
 %changelog
+* Sat Oct 13 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.2.8-2
+- Relaxed Builder dependency.
+
 * Mon Aug 13 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.2.8-1
 - Update to the ActionPack 3.2.8.
 
-- 
cgit