[arch-commits] Commit in python-flickrapi/trunk (PKGBUILD fix_setuptools.patch)

Felix Yan felixonmars at archlinux.org
Wed Jan 4 03:08:15 UTC 2017


    Date: Wednesday, January 4, 2017 @ 03:08:13
  Author: felixonmars
Revision: 204829

upgpkg: python-flickrapi 2.1.2-3

remove unwanted files

Modified:
  python-flickrapi/trunk/PKGBUILD
Deleted:
  python-flickrapi/trunk/fix_setuptools.patch

----------------------+
 PKGBUILD             |    6 +++++-
 fix_setuptools.patch |   19 -------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-03 23:15:53 UTC (rev 204828)
+++ PKGBUILD	2017-01-04 03:08:13 UTC (rev 204829)
@@ -7,7 +7,7 @@
 pkgname=(python-flickrapi python2-flickrapi)
 _pkgname=flickrapi
 pkgver=2.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The official Python interface to the Flickr API"
 arch=('any')
 url="http://stuvel.eu/flickrapi"
@@ -51,6 +51,8 @@
 
   python setup.py install --root=$pkgdir/ --optimize=1
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+
+  rm "$pkgdir"/usr/lib/python3.6/site-packages/{README,LICENSE,UPGRADING}.txt
 }
 
 package_python2-flickrapi() {
@@ -60,4 +62,6 @@
 
   python2 setup.py install --root=$pkgdir/ --optimize=1
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+
+  rm "$pkgdir"/usr/lib/python2.7/site-packages/{README,LICENSE,UPGRADING}.txt
 }

Deleted: fix_setuptools.patch
===================================================================
--- fix_setuptools.patch	2017-01-03 23:15:53 UTC (rev 204828)
+++ fix_setuptools.patch	2017-01-04 03:08:13 UTC (rev 204829)
@@ -1,19 +0,0 @@
---- a/distribute_setup.py	2013-08-17 22:57:41.227220859 +0800
-+++ b/distribute_setup.py	2013-08-17 22:57:29.343673408 +0800
-@@ -133,6 +133,16 @@
-     try:
-         try:
-             import pkg_resources
-+
-+            # Setuptools 0.7b and later is a suitable (and preferable)
-+            # substitute for any Distribute version.
-+            try:
-+                pkg_resources.require("setuptools>=0.7b")
-+                return
-+            except (pkg_resources.DistributionNotFound,
-+                    pkg_resources.VersionConflict):
-+                pass
-+
-             if not hasattr(pkg_resources, '_distribute'):
-                 if not no_fake:
-                     _fake_setuptools()



More information about the arch-commits mailing list