[rubygem-aws-sdk/el6] re-add the nokogiri patch. it's still needed.

Brett Lentz wakko666 at fedoraproject.org
Wed May 23 22:09:13 UTC 2012


commit efd83fde3b3c85c25a423bfd2fcfaba2ae54a773
Author: Brett Lentz <blentz at redhat.com>
Date:   Wed May 23 18:08:51 2012 -0400

    re-add the nokogiri patch. it's still needed.

 aws-sdk-1.4.1-gemspec.patch |   17 +++++++++++++++++
 rubygem-aws-sdk.spec        |   11 +++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/aws-sdk-1.4.1-gemspec.patch b/aws-sdk-1.4.1-gemspec.patch
new file mode 100644
index 0000000..7dcdcdd
--- /dev/null
+++ b/aws-sdk-1.4.1-gemspec.patch
@@ -0,0 +1,17 @@
+--- aws-sdk-1.4.1.gemspec.orig	2012-05-23 17:59:05.921481145 -0400
++++ aws-sdk-1.4.1.gemspec	2012-05-23 17:59:54.448482155 -0400
+@@ -20,12 +20,12 @@
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<uuidtools>, ["~> 2.1"])
+       s.add_runtime_dependency(%q<httparty>, ["~> 0.7"])
+-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
++      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.0"])
+       s.add_runtime_dependency(%q<json>, ["~> 1.4"])
+     else
+       s.add_dependency(%q<uuidtools>, ["~> 2.1"])
+       s.add_dependency(%q<httparty>, ["~> 0.7"])
+-      s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
++      s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
+       s.add_dependency(%q<json>, ["~> 1.4"])
+     end
+   else
diff --git a/rubygem-aws-sdk.spec b/rubygem-aws-sdk.spec
index b71754c..d44c1fa 100644
--- a/rubygem-aws-sdk.spec
+++ b/rubygem-aws-sdk.spec
@@ -12,6 +12,9 @@ License:        ASL 2.0
 URL:            http://aws.amazon.com/sdkforruby/
 Source0:        http://rubygems.org/gems/%{gemname}-%{version}.gem
 
+# Adjusts version requirements for nokogiri gem
+Patch0:         %{gemname}-%{version}-gemspec.patch
+
 Requires:       ruby(abi) = %{rubyabi}
 Requires:       rubygems
 Requires:       rubygem(httparty)
@@ -43,6 +46,11 @@ Documentation for %{name}
 mkdir -p .%{gemdir}
 gem install --local --install-dir .%{gemdir} \
             --force --rdoc %{SOURCE0}
+
+pushd .%{gemdir}/specifications
+%patch0
+popd
+
 %install
 mkdir -p %{buildroot}%{gemdir}
 cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
@@ -66,6 +74,9 @@ cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Wed May 23 2012 Brett Lentz <blentz at redhat.com> - 1.4.1-2
+- Re-add dropped patch to fix nokogiri deps.
+
 * Wed May 23 2012 Brett Lentz <blentz at redhat.com> - 1.4.1-1
 - Upstream release 1.4.1
 


More information about the scm-commits mailing list