[openstack-swift/el6: 10/11] Use updated parallel install versions of epel package

Alan Pevec apevec at fedoraproject.org
Wed Jan 4 23:09:13 UTC 2012


commit cee1de52de4d4b8b5749c860e4ec634300506e6b
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Jan 4 00:15:05 2012 +0100

    Use updated parallel install versions of epel package
    
    Use WebOb >= 1.0
    and depend on the EPEL parallel installable versions of the package
    to satisfy those requirements.
    Based on Nova/Glance EPEL patch by Pádraig Brady <P at draigBrady.com>

 openstack-swift.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/openstack-swift.spec b/openstack-swift.spec
index a1fb4b2..b64e9c3 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -17,6 +17,8 @@ Source4:          %{name}-container.init
 Source5:          %{name}-object.init
 Source6:          %{name}-proxy.init
 Source20:         %{name}.tmpfs
+Patch0:           openstack-swift-newdeps.patch
+
 BuildRoot:        %{_tmppath}/swift-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
@@ -30,7 +32,7 @@ Requires:         python-eventlet >= 0.9.8
 Requires:         python-greenlet >= 0.3.1
 Requires:         python-paste-deploy
 Requires:         python-simplejson
-Requires:         python-webob >= 0.9.8
+Requires:         python-webob1.0
 Requires:         pyxattr
 Requires:         python-setuptools
 Requires:         python-netifaces
@@ -115,7 +117,7 @@ BuildRequires:    python-sphinx >= 1.0
 # Required for generating docs
 BuildRequires:    python-eventlet
 BuildRequires:    python-simplejson
-BuildRequires:    python-webob
+BuildRequires:    python-webob1.0
 BuildRequires:    pyxattr
 
 %description      doc
@@ -126,6 +128,7 @@ This package contains documentation files for %{name}.
 
 %prep
 %setup -q -n swift-%{version}
+%patch0 -p1 -b .newdeps
 # Fix wrong-file-end-of-line-encoding warning
 dos2unix LICENSE
 
@@ -308,7 +311,8 @@ fi
 %doc LICENSE doc/build/html
 
 %changelog
-* Fri Nov 25 2011 Alan Pevec <apevec at redhat.com> 1.4.4-1
+* Wed Jan 04 2012 Alan Pevec <apevec at redhat.com> 1.4.4-1
+- Use updated parallel install versions of epel packages (pbrady)
 - Update to 1.4.4
 
 * Wed Nov 23 2011 David Nalley <david at gnsa.us> -1.4.3-2


More information about the scm-commits mailing list