summaryrefslogtreecommitdiffstats
path: root/glusterfs.spec.in
diff options
context:
space:
mode:
Diffstat (limited to 'glusterfs.spec.in')
-rw-r--r--glusterfs.spec.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 9f2415dda..7595748b9 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