Update to upstream release 1.7

2 files changed, 11 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb171374088f..833146dc5f89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = rpmlint
 	pkgdesc = A tool for checking common errors in rpm packages.
-	pkgver = 1.6
+	pkgver = 1.7
 	pkgrel = 1
 	url = https://github.com/rpm-software-management/rpmlint
 	arch = any
 	license = GPL2
-	checkdepends = python2-pytest
+	checkdepends = python-pytest
 	makedepends = bash-completion
 	depends = cpio
 	depends = desktop-file-utils
-	depends = python2>=2.6
+	depends = python
 	depends = rpm-org
-	source = https://github.com/rpm-software-management/rpmlint/archive/rpmlint-1.6.tar.gz
-	md5sums = 8e36e776d7f2aa00afe19157f5c38b54
+	source = https://github.com/rpm-software-management/rpmlint/archive/rpmlint-1.7.tar.gz
+	md5sums = 3741c0c8345da4f3c633328fa7b35c9c
 
 pkgname = rpmlint
 
diff --git a/PKGBUILD b/PKGBUILD
index b14e0cc45472..23efb792c0e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,26 @@
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 
 pkgname=rpmlint
-pkgver=1.6
+pkgver=1.7
 pkgrel=1
 pkgdesc='A tool for checking common errors in rpm packages.'
 arch=('any')
 url="https://github.com/rpm-software-management/$pkgname"
 license=('GPL2')
-depends=('cpio' 'desktop-file-utils' 'python2>=2.6' 'rpm-org')
+depends=('cpio' 'desktop-file-utils' 'python' 'rpm-org')
 makedepends=('bash-completion')
-checkdepends=('python2-pytest')
+checkdepends=('python-pytest')
 source=("$url/archive/$pkgname-$pkgver.tar.gz")
-md5sums=('8e36e776d7f2aa00afe19157f5c38b54')
+md5sums=('3741c0c8345da4f3c633328fa7b35c9c')
 
 prepare() {
 	mv "$pkgname-$pkgname-$pkgver" "$pkgname-$pkgver"
-
-	cd "$pkgname-$pkgver"
-
-	for file in "$pkgname" rpmdiff tools/generate-isocodes.py; do
-		sed -e 's_/usr/bin/python_&2_' -i "$file"
-	done
-
-	sed -e 's_py\.test_&2_' -i test.sh
 }
 
 build() {
 	cd "$pkgname-$pkgver"
 
-	make PYTHON=python2 COMPILE_PYC=1
+	make COMPILE_PYC=1
 }
 
 # Tests need a non-empty RPM database on the system
@@ -42,7 +34,7 @@ build() {
 package() {
 	cd "$pkgname-$pkgver"
 
-	make PYTHON=python2 DESTDIR="$pkgdir/" install
+	make DESTDIR="$pkgdir/" install
 
 	install -Dp -m644 README "$pkgdir/usr/share/doc/$pkgname/README"
 }