[python-swiftclient] update conflict with older swift-im

Alan Pevec apevec at fedoraproject.org
Wed Oct 10 15:01:28 UTC 2012


commit db07e87791d8647ffd7da9bf9bdba5e1af002466
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Oct 10 17:00:11 2012 +0200

    update conflict with older swift-im
    
    swift 2.0-0.3 renamed binary to swift-im rhbz#857900

 python-swiftclient.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/python-swiftclient.spec b/python-swiftclient.spec
index dda6c83..e9f02a1 100644
--- a/python-swiftclient.spec
+++ b/python-swiftclient.spec
@@ -1,6 +1,6 @@
 Name:       python-swiftclient
 Version:    1.2.0
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Python API and CLI for OpenStack Swift
 
 License:    ASL 2.0
@@ -16,8 +16,8 @@ Source0:    http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
 
 
 Requires:   python-simplejson
-# /usr/bin/swift collision with swift-im rhbz#857900
-Conflicts:  swift
+# /usr/bin/swift collision with older swift-im rhbz#857900
+Conflicts:  swift < 2.0-0.3
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools


More information about the scm-commits mailing list