From 6c8b0452c28080259615ac51eb88e9f237a04bdb013eb81a1bfd0e25fd104081 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 17 Sep 2013 11:25:32 +0000 Subject: [PATCH] Accepting request 199200 from home:mvyskocil - don't use distribute bootstrapping code as it attempt to download files * flickrapi-drop-bootstrap-distribute.patch OBS-URL: https://build.opensuse.org/request/show/199200 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flickrapi?expand=0&rev=6 --- flickrapi-drop-bootstrap-distribute.patch | 14 ++++++++++++++ python-flickrapi.changes | 6 ++++++ python-flickrapi.spec | 6 ++++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 flickrapi-drop-bootstrap-distribute.patch diff --git a/flickrapi-drop-bootstrap-distribute.patch b/flickrapi-drop-bootstrap-distribute.patch new file mode 100644 index 0000000..c868db0 --- /dev/null +++ b/flickrapi-drop-bootstrap-distribute.patch @@ -0,0 +1,14 @@ +Index: flickrapi-1.4.2/setup.py +=================================================================== +--- flickrapi-1.4.2.orig/setup.py ++++ flickrapi-1.4.2/setup.py +@@ -5,9 +5,6 @@ + Run with "python setup.py install" to install FlickrAPI + ''' + +-import distribute_setup +-distribute_setup.use_setuptools() +- + import sys + + # Check the Python version diff --git a/python-flickrapi.changes b/python-flickrapi.changes index 644b6d6..aea8f9b 100644 --- a/python-flickrapi.changes +++ b/python-flickrapi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 16 08:58:45 UTC 2013 - mvyskocil@suse.com + +- don't use distribute bootstrapping code as it attempt to download files + * flickrapi-drop-bootstrap-distribute.patch + ------------------------------------------------------------------- Thu Jan 12 11:31:09 UTC 2012 - coolo@suse.com diff --git a/python-flickrapi.spec b/python-flickrapi.spec index 686c136..4d35e0b 100644 --- a/python-flickrapi.spec +++ b/python-flickrapi.spec @@ -23,11 +23,12 @@ Url: http://stuvel.eu/projects/flickrapi Summary: Python interface to Flickr License: Python-2.0 Group: Development/Libraries/Python -Source: flickrapi-%{version}.zip +Source0: flickrapi-%{version}.zip +Patch0: flickrapi-drop-bootstrap-distribute.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-docutils BuildRequires: python-devel -BuildRequires: python-distribute +BuildRequires: python-setuptools BuildRequires: python-xml BuildRequires: unzip Requires: python-xml @@ -53,6 +54,7 @@ photos, and all Flickr API functions. %prep %setup -q -n flickrapi-%{version} sed -i "1d" flickrapi/__init__.py # Fix non-executable script +%patch0 -p1 %build python setup.py build