diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-04-11 09:36:35 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-04-12 00:22:47 -0700 |
| commit | 77a02c4dd8467e2a78b3ab3cdef95178ef4b1898 (patch) | |
| tree | 29ca9df785539be4e8485a22472530c849174b54 /glusterfs.spec.in | |
| parent | efa154bb0a4cac34d5a9610ec25d38eebe495f22 (diff) | |
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 <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/4807
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 9f2415dda90..7595748b9fd 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 |