update packaging

2 files changed, 20 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06bd0588b7bc..5e496c4a686a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = python-ffmpeg-python
 	pkgdesc = (old) Python bindings for FFmpeg with complex filtering support
 	pkgver = 0.2.0
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/kkroening/ffmpeg-python
 	arch = any
-	license = Apache
+	license = Apache-2.0
 	checkdepends = python-pytest
 	checkdepends = python-pytest-mock
+	checkdepends = python-pytest-runner
 	makedepends = python-build
 	makedepends = python-installer
-	makedepends = python-pytest-runner
 	makedepends = python-setuptools
 	makedepends = python-wheel
 	depends = ffmpeg
+	depends = python
 	depends = python-future
 	depends = python-graphviz
-	provides = python-ffmpeg
-	conflicts = python-ffmpeg
 	conflicts = python-python-ffmpeg
 	options = !emptydirs
 	source = ffmpeg-python-0.2.0.tar.gz::https://github.com/kkroening/ffmpeg-python/archive/0.2.0.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index a6f3df0e9f3f..6e88456fc404 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,87 +7,56 @@ _module='ffmpeg-python'
 _pkgname="python-$_module"
 pkgname="$_pkgname"
 pkgver=0.2.0
-pkgrel=5
+pkgrel=6
 pkgdesc="(old) Python bindings for FFmpeg with complex filtering support"
-arch=(any)
 url="https://github.com/kkroening/ffmpeg-python"
-license=('Apache')
-options=(!emptydirs)
+license=('Apache-2.0')
+arch=(any)
+
 depends=(
   'ffmpeg'
+  'python'
   'python-future'
   'python-graphviz'
 )
 makedepends=(
   'python-build'
   'python-installer'
-  'python-pytest-runner'
   'python-setuptools'
   'python-wheel'
 )
 checkdepends=(
   'python-pytest'
   'python-pytest-mock'
+  'python-pytest-runner'
 )
 
-provides=(
-  'python-ffmpeg'
-)
-conflicts=(
-  'python-ffmpeg'
-  'python-python-ffmpeg'
-)
-
-if [ x"$_pkgname" == x"$pkgname" ] ; then
-  # normal package
-  _pkgsrc="$_module-$pkgver"
-
-  source+=(
-    "$_module-$pkgver.tar.gz"::"https://github.com/kkroening/ffmpeg-python/archive/$pkgver.tar.gz"
-  )
-  sha256sums+=(
-    '01b6b7640f00585a404194a358358bdf7f4050cedcd99f41416ac8b27222c9f1'
-  )
-else
-  # x-git package
-  _pkgsrc="$_module"
+conflicts=('python-python-ffmpeg')
 
-  makedepends+=('git')
-
-  provides+=("$_pkgname")
-  conflicts+=("$_pkgname")
-
-  source+=(
-    "$_module"::"git+https://github.com/kkroening/ffmpeg-python"
-  )
-  sha256sums+=(
-    'SKIP'
-  )
+options=(!emptydirs)
 
-  pkgver() {
-    cd "$srcdir/$_pkgsrc"
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-  }
-fi
+_pkgsrc="$_module-$pkgver"
+source=("$_pkgsrc.tar.gz"::"https://github.com/kkroening/ffmpeg-python/archive/$pkgver.tar.gz")
+sha256sums=('01b6b7640f00585a404194a358358bdf7f4050cedcd99f41416ac8b27222c9f1')
 
 prepare() {
-  cd "$srcdir/$_pkgsrc"
+  cd "$_pkgsrc"
   sed -i -e 's/collections.Iterable/collections.abc.Iterable/g' ffmpeg/_run.py
 }
 
 build() {
-  cd "$srcdir/$_pkgsrc"
+  cd "$_pkgsrc"
   python -m build --no-isolation --wheel
 }
 
 check(){
-  cd "$srcdir/$_pkgsrc"
+  cd "$_pkgsrc"
   pytest || true
 }
 
 package() {
-  cd "$srcdir/$_pkgsrc"
+  cd "$_pkgsrc"
   python -m installer --destdir="$pkgdir" dist/*.whl
 
-  install -vDm0644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm0644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 }