[python-flickrapi] Patch distribute out in favor of setuptools
Maxim Burgerhout
wzzrd at fedoraproject.org
Sun Aug 4 22:11:47 UTC 2013
commit 1915b1913fadcf80c8cd377e386d574fad4fe44f
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date: Sun Aug 4 23:55:32 2013 +0200
Patch distribute out in favor of setuptools
python-flickrapi.spec | 10 ++++++++--
setuptools.patch | 14 ++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/python-flickrapi.spec b/python-flickrapi.spec
index 04a1a06..8d3547e 100644
--- a/python-flickrapi.spec
+++ b/python-flickrapi.spec
@@ -2,7 +2,7 @@
Name: python-flickrapi
Version: 1.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Python module for interfacing with the Flickr API
Group: Development/Languages
@@ -11,6 +11,8 @@ URL: http://stuvel.eu/flickrapi
Source0: http://pypi.python.org/packages/source/f/flickrapi/flickrapi-%{version}.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: setuptools.patch
+
BuildArch: noarch
BuildRequires: python-devel, python-setuptools, python-docutils
@@ -21,7 +23,8 @@ A Python module for interfacing with the Flickr API.
%prep
%setup -q -n flickrapi-%{version}
-
+%patch0 -p1 -b .setuptools
+rm -v distribute_setup.py
%build
%{__python} setup.py build
@@ -48,6 +51,9 @@ rm -rf %{buildroot}
%exclude /usr/UPGRADING
%changelog
+* Sun Aug 04 2013 Maxim Burgerhout <wzzrd at fedoraproject.org.> 1.4.2-6
+- Fixing breakage caused by distribute
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/setuptools.patch b/setuptools.patch
new file mode 100644
index 0000000..717bed7
--- /dev/null
+++ b/setuptools.patch
@@ -0,0 +1,14 @@
+diff -up /tmp/flickrapi-1.4.2/setup.py.orig /tmp/flickrapi-1.4.2/setup.py
+--- flickrapi-1.4.2/setup.py.orig 2013-08-04 23:41:58.078487811 +0200
++++ flickrapi-1.4.2/setup.py 2013-08-04 23:42:21.270636952 +0200
+@@ -5,8 +5,7 @@
+ Run with "python setup.py install" to install FlickrAPI
+ '''
+
+-import distribute_setup
+-distribute_setup.use_setuptools()
++from setuptools import setup
+
+ import sys
+
+
More information about the scm-commits
mailing list