[packages/python-docker] add buildconflict for old pypi name

glen glen at pld-linux.org
Tue Jul 18 08:42:19 CEST 2017


commit 2492f6694277b05e144d419be6338f757fc77c89
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Jul 18 09:27:05 2017 +0300

    add buildconflict for old pypi name
    
    + /usr/bin/python2 setup.py build '--build-base=build-2'
    ERROR: "docker-py" needs to be uninstalled before installing this package:
    pip uninstall docker-py

 python-docker.spec | 2 ++
 1 file changed, 2 insertions(+)
---
diff --git a/python-docker.spec b/python-docker.spec
index 221c967..f649887 100644
--- a/python-docker.spec
+++ b/python-docker.spec
@@ -21,10 +21,12 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.710
 %if %{with python2}
 BuildRequires:	python-setuptools
+BuildConflicts:	python-docker < 2.0
 %endif
 %if %{with python3}
 BuildRequires:	python3-modules
 BuildRequires:	python3-setuptools
+BuildConflicts:	python3-docker < 2.0
 %endif
 # Docker can be remote, so suggest only
 Suggests:	docker >= 1.3.3
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-docker.git/commitdiff/b7e5dc8d9a8a5d6ecc6b113276b3e296220bd63c



More information about the pld-cvs-commit mailing list