mutagen-git: Fix build

2 files changed, 17 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c029827f4ede..ac2fcc461311 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = mutagen-git
 	pkgdesc = An audio metadata tag reader and writer, mercurial version
-	pkgver = 1479.b15f1f4
-	pkgrel = 1
+	pkgver = 1571.cb363c1
+	pkgrel = 2
 	url = https://github.com/quodlibet/mutagen
 	arch = any
 	license = GPL2
 	makedepends = git
 	depends = python-setuptools
 	provides = mutagen
+	provides = python-mutagen
 	conflicts = mutagen
+	conflicts = python-mutagen
 	source = mutagen-git::git+https://github.com/quodlibet/mutagen.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 8c65c3a7f9f9..ce6fae9bbe5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@ pkgname=mutagen-git
 pkgdesc="An audio metadata tag reader and writer, mercurial version"
 license=('GPL2')
 url="https://github.com/quodlibet/mutagen"
-pkgver=1479.b15f1f4
-pkgrel=1
+pkgver=1571.cb363c1
+pkgrel=2
 
-conflicts=('mutagen')
-provides=('mutagen')
+conflicts=('mutagen' 'python-mutagen')
+provides=('mutagen' 'python-mutagen')
 
 source=("$pkgname::git+$url.git")
 md5sums=('SKIP')
@@ -21,10 +21,16 @@ pkgver() {
     echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
+build() {
+    cd "$srcdir/$pkgname"
+    python setup.py build
+}
+
 package() {
     cd "$srcdir/$pkgname"
 
-    python setup.py install --root="${pkgdir}"
-    install -d "${pkgdir}/usr/bin"
-    install -m755 tools/* "${pkgdir}/usr/bin"
+    python setup.py install --skip-build \
+                            --optimize=1 \
+                            --prefix=/usr \
+                            --root="${pkgdir}"
 }