[rubygem-actionpack] Relaxed erubis dependency Fixed build compatibility with RubyGems 1.5
Vít Ondruch
vondruch at fedoraproject.org
Wed Feb 16 13:45:25 UTC 2011
commit eb9710a3a9be9f09d87a08a129a9c847945875aa
Author: Vít Ondruch <vondruch at redhat.com>
Date: Wed Feb 16 14:44:32 2011 +0100
Relaxed erubis dependency
Fixed build compatibility with RubyGems 1.5
actionpack-add-rack-mount-deps.patch | 6 +++---
actionpack-downgrade-dependencies.patch | 2 +-
rubygem-actionpack.spec | 12 +++++++++---
3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/actionpack-add-rack-mount-deps.patch b/actionpack-add-rack-mount-deps.patch
index 5f769ee..0ff26e8 100644
--- a/actionpack-add-rack-mount-deps.patch
+++ b/actionpack-add-rack-mount-deps.patch
@@ -1,6 +1,6 @@
--- specifications/actionpack-3.0.3.gemspec.orig 2011-02-01 17:55:54.677899001 -0500
+++ specifications/actionpack-3.0.3.gemspec 2011-02-01 17:56:04.943899003 -0500
-@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
+@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<rack>, [">= 1.1.0"])
s.add_runtime_dependency(%q<rack-test>, [">= 0.5.4"])
s.add_runtime_dependency(%q<rack-mount>, [">= 0.6.13"])
@@ -9,7 +9,7 @@
s.add_runtime_dependency(%q<tzinfo>, ["~> 0.3.23"])
s.add_runtime_dependency(%q<erubis>, ["~> 2.6.5"])
else
-@@ -40,6 +42,8 @@ Gem::Specification.new do |s|
+@@ -39,6 +41,8 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rack>, [">= 1.1.0"])
s.add_dependency(%q<rack-test>, [">= 0.5.4"])
s.add_dependency(%q<rack-mount>, [">= 0.6.13"])
@@ -18,7 +18,7 @@
s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
s.add_dependency(%q<erubis>, ["~> 2.6.5"])
end
-@@ -51,6 +55,8 @@ Gem::Specification.new do |s|
+@@ -50,6 +54,8 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rack>, [">= 1.1.0"])
s.add_dependency(%q<rack-test>, [">= 0.5.4"])
s.add_dependency(%q<rack-mount>, [">= 0.6.13"])
diff --git a/actionpack-downgrade-dependencies.patch b/actionpack-downgrade-dependencies.patch
index 94f268c..3d383f9 100644
--- a/actionpack-downgrade-dependencies.patch
+++ b/actionpack-downgrade-dependencies.patch
@@ -1,6 +1,6 @@
--- specifications/actionpack-3.0.3.gemspec.orig 2011-01-18 16:24:30.469405214 -0500
+++ specifications/actionpack-3.0.3.gemspec 2011-01-18 16:26:01.445405000 -0500
-@@ -27,31 +27,31 @@ Gem::Specification.new do |s|
+@@ -26,31 +26,31 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<activemodel>, ["= 3.0.3"])
s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
s.add_runtime_dependency(%q<i18n>, ["~> 0.4"])
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index 5d2f207..e3ed902 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -9,7 +9,7 @@ Summary: Web-flow and rendering framework putting the VC in MVC
Name: rubygem-%{gemname}
Epoch: 1
Version: 3.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Development/Languages
License: MIT
URL: http://www.rubyonrails.org
@@ -54,7 +54,8 @@ Requires: rubygem(rack) >= 1.0.0
Requires: rubygem(rack-test)
Requires: rubygem(rack-mount)
Requires: rubygem(tzinfo) >= 0.3.23
-Requires: rubygem(erubis) = 2.6.5
+Requires: rubygem(erubis) >= 2.6.5
+Requires: rubygem(erubis) < 2.7.0
Requires: ruby(abi) = %{rubyabi}
BuildRequires: rubygems
BuildRequires: rubygem(rake)
@@ -69,7 +70,8 @@ BuildRequires: rubygem(rack) >= 1.0.0
BuildRequires: rubygem(rack-test)
BuildRequires: rubygem(rack-mount)
BuildRequires: rubygem(tzinfo) >= 0.3.23
-BuildRequires: rubygem(erubis) = 2.6.5
+BuildRequires: rubygem(erubis) >= 2.6.5
+BuildRequires: rubygem(erubis) < 2.7.0
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}
@@ -171,6 +173,10 @@ rake test --trace
%changelog
+* Wed Feb 16 2011 Vít Ondruch <vondruch at redhat.com> - 1:3.0.3-4
+- Relaxed erubis dependency
+- Fixed build compatibility with RubyGems 1.5
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list