From b868fe0833f16f202e6d2cf4d55aa65aa70c0773495db06cc8ec57384d58df77 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 17 May 2017 08:19:09 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flickrapi?expand=0&rev=10 --- flickrapi-1.4.2.zip | 3 ++ flickrapi-2.3.tar.gz | 3 -- flickrapi-drop-bootstrap-distribute.patch | 14 ++++++ python-flickrapi.changes | 45 ------------------- python-flickrapi.spec | 53 ++++++++++++----------- 5 files changed, 44 insertions(+), 74 deletions(-) create mode 100644 flickrapi-1.4.2.zip delete mode 100644 flickrapi-2.3.tar.gz create mode 100644 flickrapi-drop-bootstrap-distribute.patch diff --git a/flickrapi-1.4.2.zip b/flickrapi-1.4.2.zip new file mode 100644 index 0000000..deb9169 --- /dev/null +++ b/flickrapi-1.4.2.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac9304f571175b8af4fc2ee17d3e110847b526640665ca53d97bbf9df98329bc +size 79045 diff --git a/flickrapi-2.3.tar.gz b/flickrapi-2.3.tar.gz deleted file mode 100644 index 622077f..0000000 --- a/flickrapi-2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:897bd7de9cd6ab878fa1a9816e4e58d317e447135e93d2f784ce9134610b7b99 -size 28511 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 1fabd97..aea8f9b 100644 --- a/python-flickrapi.changes +++ b/python-flickrapi.changes @@ -1,48 +1,3 @@ -------------------------------------------------------------------- -Tue May 16 16:07:22 UTC 2017 - dmueller@suse.com - -- update to 2.3: - - Removed flickrapi/contrib.py, as a persistent connection is now managed (much better) - - Added explicit support for Python 3.5. - - Moved from a Mercurial repository at BitBucket to a [Git repository - at GitHub](https://github.com/sybrenstuvel/flickrapi/). - - Mocking some calls to Flickr, so that unit tests can run without - requiring the user to authenticate via the browser. This also - prevents the upload of the test photo. - - More serious testing, using py.test and Tox to test on all support - versions of Python. - - Automated builds are performed with Travis-CI. - - Make flickrapi token storage directory configurable. - [[ Feature request #68 ]](https://github.com/sybrenstuvel/flickrapi/issues/68) - - Put requests in a session to benefit from connection reuse (Alexandre L). - - When uploading a photo, send the title as UTF8 - - Sort many photosets with 'flickr.photosets.orderSets' failed - [[ Bug report #74]](https://github.com/sybrenstuvel/flickrapi/issues/74) - - Converted requested_permissions to unicode and ported authentication - example to Python 3 (Michael Klich). - -------------------------------------------------------------------- -Tue May 5 12:31:06 UTC 2015 - benoit.monin@gmx.fr - -- update to version 2.0: - * Major revision; now uses OAuth to interface with Flickr. - Combines work of Sybren A. Stüvel, Jim Easterbrook, - Thai Nguyen, Nick Loadholtes and Bengt. -- drop flickrapi-drop-bootstrap-distribute.patch: fixed upstream -- point the source URL to pypi -- remove unneeded depedencies to python-docutils, python-xml - and unzip -- add new dependencies required by upstream: - * python-requests - * python-requests-oauthlib - * python-requests-toolbelt - * python-six -- always requires fdupes and run it after install -- define python_sitelib only for SLE11 -- doc is not provided anymore: do not build it -- rename LICENSE, README, UPGRADING to LICENSE.txt, README.txt, - UPGRADING.txt: changed upstream - ------------------------------------------------------------------- Mon Sep 16 08:58:45 UTC 2013 - mvyskocil@suse.com diff --git a/python-flickrapi.spec b/python-flickrapi.spec index eded499..4d35e0b 100644 --- a/python-flickrapi.spec +++ b/python-flickrapi.spec @@ -1,7 +1,7 @@ # # spec file for package python-flickrapi # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,39 +11,39 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. - +# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-flickrapi -Version: 2.3 +Version: 1.4.2 Release: 0 Url: http://stuvel.eu/projects/flickrapi Summary: Python interface to Flickr License: Python-2.0 Group: Development/Libraries/Python -Source0: https://pypi.io/packages/source/f/flickrapi/flickrapi-%{version}.tar.gz +Source0: flickrapi-%{version}.zip +Patch0: flickrapi-drop-bootstrap-distribute.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{python_module requests } -BuildRequires: %{python_module requests-oauthlib } -BuildRequires: %{python_module requests-toolbelt } -BuildRequires: %{python_module setuptools } -BuildRequires: %{python_module six } -BuildRequires: fdupes +BuildRequires: python-docutils BuildRequires: python-devel -BuildRequires: python-rpm-macros -Requires: python-requests >= 2.4.3 -Requires: python-requests-oauthlib >= 0.4.2 -Requires: python-requests-toolbelt >= 0.3.1 -Requires: python-six >= 1.8.0 -%ifpython2 +BuildRequires: python-setuptools +BuildRequires: python-xml +BuildRequires: unzip +Requires: python-xml +%if 0%{?suse_version} +%py_requires +%if 0%{?suse_version} > 1010 +BuildRequires: fdupes +%endif +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif +%endif Provides: python-flickrapi-doc = %{version} Obsoletes: python-flickrapi-doc < %{version} -%endif -BuildArch: noarch -%python_subpackages +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description The easiest to use, most complete, and most actively developed @@ -54,18 +54,19 @@ 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_build +python setup.py build +cd doc && make # Build HTML documentation %install -%python_install -rm -rf %{buildroot}%{python_sitelib}/*.txt # Remove wrongly installed documentation -%fdupes %{buildroot}/%{_prefix} +python setup.py install --prefix=%{_prefix} --root=%{buildroot} +rm -rf %{buildroot}/usr/{{LICENSE,README,UPGRADING},share/doc/flickrapi-%{version}} # Remove wrongly installed documentation -%files %{python_files} +%files %defattr(-,root,root) -%doc LICENSE.txt README.md +%doc LICENSE README UPGRADING %{python_sitelib}/* %changelog