From 77a02c4dd8467e2a78b3ab3cdef95178ef4b1898 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 11 Apr 2013 09:36:35 -0400 Subject: object-storage: rebase Swift to 1.8.0 (grizzly) Two minor tweaks found while packaging 3.4.0-0.1.alpha2 for Fedora 19 BUG: 948039 Change-Id: I97175636164702cf4042bc4a18ffead76ad386cb Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: http://review.gluster.org/4807 Reviewed-by: Jeff Darcy Tested-by: Gluster Build System --- glusterfs.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 9f2415dd..7595748b 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -388,7 +388,9 @@ Requires: python-netifaces Requires: python-swiftclient %endif +%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) Conflicts: openstack-swift +%endif %description swift @@ -492,7 +494,7 @@ BuildArch: noarch %if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) Requires: %{name}-swift = %{version}-%{release} %else -Requires: openstack-swift = %{SWIFTVER}-1 +Requires: openstack-swift = %{SWIFTVER} %endif Requires: memcached Requires: openssl -- cgit