[packages/youtube-dl] python-distribute and python-setuptools produce different eggs

glen glen at pld-linux.org
Wed Apr 22 17:43:44 CEST 2015


commit 17628040880b6744b7bfd7c5de349cd62c07b613
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Apr 22 18:42:39 2015 +0300

    python-distribute and python-setuptools produce different eggs
    
    to ensure consistent builds between builders:
    -/usr/share/python2.7/site-packages/youtube_dl-2015.04.17-py2.7.egg-info
    +/usr/share/python2.7/site-packages/youtube_dl-2015.4.17-py2.7.egg-info
    
    just pick one of them.

 youtube-dl.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/youtube-dl.spec b/youtube-dl.spec
index 5211f75..0292e82 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -11,7 +11,7 @@ Summary:	Video extraction utility for YouTube
 Summary(pl.UTF-8):	Narzędzie do wydobywania filmów z YouTube
 Name:		youtube-dl
 Version:	%{ver}
-Release:	2
+Release:	3
 Epoch:		2
 License:	Public Domain
 Group:		Applications/System
@@ -22,6 +22,7 @@ URL:		http://youtube-dl.org/
 BuildRequires:	python-distribute
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
+BuildConflicts:	python-setuptools
 Requires:	python-distribute
 Requires:	python-pyxattr >= 0.5.0
 BuildArch:	noarch
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/youtube-dl.git/commitdiff/17628040880b6744b7bfd7c5de349cd62c07b613



More information about the pld-cvs-commit mailing list