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.

diff --git a/youtube-dl.spec b/youtube-dl.spec
index 5211f7568f123e285db6bc620501385756f3c2df..0292e82dce84c2c12bc2c23a97209a1b2e5084cb 100644 (file)
--- 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