[python-tag] Patch out "distribute" downloading/usage to make this build.

Michael Schwendt mschwendt at fedoraproject.org
Mon Nov 25 11:57:29 UTC 2013


commit f8ed954614f805acfe318e455fcb4c4f525913d3
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Mon Nov 25 12:57:20 2013 +0100

    Patch out "distribute" downloading/usage to make this build.

 python-tag.spec                  |    4 ++++
 tagpy-2013.1-no-distribute.patch |   21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/python-tag.spec b/python-tag.spec
index c780b73..68cb900 100644
--- a/python-tag.spec
+++ b/python-tag.spec
@@ -8,6 +8,8 @@ License: BSD
 Group: Development/Languages
 URL: http://pypi.python.org/pypi/tagpy
 Source0: http://pypi.python.org/packages/source/t/tagpy/tagpy-%{version}.tar.gz
+# don't try to download/use "distribute" 0.6.19
+Patch0: tagpy-2013.1-no-distribute.patch
 
 Provides: tagpy = %{version}-%{release}
 BuildRequires: python-devel
@@ -22,6 +24,7 @@ Vorbis Files and Ogg Flac Files and access APE tags in Musepack and MP3 files.
 
 %prep
 %setup -q -n tagpy-%{version}
+%patch0 -p1 -b .distribute-usage
 
 %build
 CFLAGS="%{optflags} `pkg-config --cflags taglib`" python setup.py build
@@ -35,6 +38,7 @@ python setup.py install -O1 --skip-build --root %{buildroot}
 
 %changelog
 * Mon Nov 25 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2013.1-4
+- Patch out "distribute" downloading/usage to make this build.
 - Rebuild for Boost 1.54 FTBFS.
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.1-3
diff --git a/tagpy-2013.1-no-distribute.patch b/tagpy-2013.1-no-distribute.patch
new file mode 100644
index 0000000..fe11acd
--- /dev/null
+++ b/tagpy-2013.1-no-distribute.patch
@@ -0,0 +1,21 @@
+diff -Nur tagpy-2013.1-orig/aksetup_helper.py tagpy-2013.1/aksetup_helper.py
+--- tagpy-2013.1-orig/aksetup_helper.py	2012-12-16 02:56:27.000000000 +0100
++++ tagpy-2013.1/aksetup_helper.py	2013-11-25 12:28:04.066359696 +0100
+@@ -1,6 +1,6 @@
+ # dealings with ez_setup ------------------------------------------------------
+-import distribute_setup
+-distribute_setup.use_setuptools()
++#import distribute_setup
++#distribute_setup.use_setuptools()
+ 
+ import setuptools
+ from setuptools import Extension
+@@ -18,7 +18,7 @@
+ 
+ 
+ 
+-if not hasattr(setuptools, "_distribute"):
++if False: #not hasattr(setuptools, "_distribute"):
+     print("-------------------------------------------------------------------------")
+     print("Setuptools conflict detected.")
+     print("-------------------------------------------------------------------------")


More information about the scm-commits mailing list