Release 2.2.0-2

3 files changed, 59 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cef008985c8..e41097979696 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = python-exifread
-	pkgdesc = Read Exif metadata from tiff and jpeg files.
-	pkgver = 2.1.2
+	pkgdesc = Python library to extract EXIF data from tiff and jpeg files
+	pkgver = 2.2.0
 	pkgrel = 2
 	url = https://github.com/ianare/exif-py
 	arch = any
 	license = BSD
-	makedepends = python2-pip
-	makedepends = python-pip
+	makedepends = python-setuptools
 	depends = python
-	source = https://pypi.python.org/packages/source/E/ExifRead/ExifRead-2.1.2.tar.gz
-	md5sums = 8f5099e11e2137e0ce5acbec91c219be
-
-pkgname = python2-exifread
+	source = python-exifread-2.2.0.tar.gz::https://github.com/ianare/exif-py/archive/2.2.0.tar.gz
+	source = fix-warning-list-for-qualifier.patch
+	sha1sums = eec3d5f355a210d78409ec91dee2b794e482410a
+	sha1sums = 94e870d0f0beb3b31b0cac08d46202950bc89385
+	sha256sums = 55b8dbdfa1c55da50a0b989cbcd591bb996f36adff27cc207b350b25d76d2828
+	sha256sums = 511417020ddbe39d2f28a8a20515de3d126bada0e700a34ab5018a86c594bd2a
 
 pkgname = python-exifread
 
diff --git a/PKGBUILD b/PKGBUILD
index 946d4d8e7d2f..e72cf996a0cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,41 @@
-# Maintainer: Christopher Loen <christopherloen at gmail dot com>
+# Maintainer: nblock <nblock [/at\] archlinux DOT us>
+# Contributor: Simon Chabot <simon dot chabot at etu dot utc dot fr>
+# Contributor: Christopher Loen <christopherloen at gmail dot com>
 # Contributor: David McInnis <davidm@eagles.ewu.edu>
 
-pkgbase=('python-exifread')
-pkgname=('python2-exifread' 'python-exifread')
-_module='ExifRead'
-pkgver='2.1.2'
+pkgname=python-exifread
+_name="exif-py"
+pkgver=2.2.0
 pkgrel=2
-pkgdesc="Read Exif metadata from tiff and jpeg files."
+pkgdesc="Python library to extract EXIF data from tiff and jpeg files"
+arch=('any')
 url="https://github.com/ianare/exif-py"
-depends=('python')
-makedepends=('python2-pip' 'python-pip')
 license=('BSD')
-arch=('any')
-source=("https://pypi.python.org/packages/source/E/ExifRead/ExifRead-${pkgver}.tar.gz")
-md5sums=('8f5099e11e2137e0ce5acbec91c219be')
+depends=('python')
+makedepends=('python-setuptools')
+# 2.2.0 was not properly uploaded to PyPi, download the tarball from project's
+# release page instead: https://github.com/ianare/exif-py/issues/97
+source=("$pkgname-$pkgver.tar.gz::https://github.com/ianare/$_name/archive/$pkgver.tar.gz"
+        "fix-warning-list-for-qualifier.patch")
+sha1sums=('eec3d5f355a210d78409ec91dee2b794e482410a'
+          '94e870d0f0beb3b31b0cac08d46202950bc89385')
+sha256sums=('55b8dbdfa1c55da50a0b989cbcd591bb996f36adff27cc207b350b25d76d2828'
+            '511417020ddbe39d2f28a8a20515de3d126bada0e700a34ab5018a86c594bd2a')
 
-package_python2-exifread() {
-    cd "${srcdir}/${_module}-${pkgver}"
-    echo :: Installing for python2.7 ...
-    pip2 install --isolated --prefix=/usr --root="${pkgdir}" --no-deps --ignore-installed .
-    
-    install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE.txt"
+prepare() {
+  cd "$_name-$pkgver"
+  patch -p0 -i "$srcdir/fix-warning-list-for-qualifier.patch"
 }
 
-package_python-exifread() {
-    cd "${srcdir}/${_module}-${pkgver}"
-    echo :: Installing for python3 up to python3.4 ...
-    pip3 install --isolated --prefix=/usr --root="${pkgdir}" --no-deps --ignore-installed .
+build() {
+  cd "$_name-$pkgver"
+  python setup.py build
 }
+
+package() {
+  cd "$_name-$pkgver"
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/fix-warning-list-for-qualifier.patch b/fix-warning-list-for-qualifier.patch
new file mode 100644
index 000000000000..2ccc0e4c4378
--- /dev/null
+++ b/fix-warning-list-for-qualifier.patch
@@ -0,0 +1,18 @@
+--- setup.py.old	2019-12-31 13:07:53.432978632 +0100
++++ setup.py	2019-12-31 13:08:03.056499371 +0100
+@@ -17,7 +17,7 @@
+     keywords="exif image metadata photo",
+     description=" ".join(exifread.__doc__.splitlines()).strip(),
+     long_description=readme_file,
+-    classifiers=(
++    classifiers=[
+         "Development Status :: 5 - Production/Stable",
+         "Environment :: Console",
+         "Intended Audience :: Developers",
+@@ -30,5 +30,5 @@
+         "Programming Language :: Python :: 3.6",
+         "Programming Language :: Python :: 3.7",
+         "Topic :: Utilities",
+-    ),
++    ],
+ )