tails-installer - update to 5.0.7

- Remove i686 from arch
- Remove useless prepare function
- Remove python2 patch (upstream uses python2 correctly now)
- Use separate build function

2 files changed, 10 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a344419..fa78ca6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,9 @@
-# Generated by mksrcinfo v8
-# Sun Jan  1 22:22:00 UTC 2017
 pkgbase = tails-installer
 	pkgdesc = Installer for the Tails live operating system
-	pkgver = 4.4.11
+	pkgver = 5.0.7
 	pkgrel = 1
 	url = https://tails.boum.org/
 	arch = x86_64
-	arch = i686
 	license = GPL
 	makedepends = git
 	depends = cdrkit
@@ -24,7 +21,7 @@ pkgbase = tails-installer
 	depends = syslinux
 	depends = udisks2
 	depends = urlgrabber
-	source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.11
+	source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_5.0.7
 	sha256sums = SKIP
 
 pkgname = tails-installer
diff --git a/PKGBUILD b/PKGBUILD
index 06cad8f..6c43bec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Yuval Adam <yuval at y3xz dot com> PGP-Key: 271386AA2EB7672F
 
 pkgname=tails-installer
-pkgver=4.4.11
+pkgver=5.0.7
 pkgrel=1
 pkgdesc="Installer for the Tails live operating system"
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url="https://tails.boum.org/"
 license=(GPL)
 depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'mtools' 'p7zip' 'parted' 'python2-configobj' 'python2-distutils-extra' 'python2-gobject' 'syslinux' 'udisks2' 'urlgrabber')
@@ -13,14 +13,15 @@ source=("git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}"
 sha256sums=('SKIP')
 _pkgname=liveusb-creator
 
-prepare() {
-  cd "${srcdir}/${_pkgname}"
+build() {
+  cd liveusb-creator
+  python2 setup.py build
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}"
-  sed -i '1!b;s/python/python2/' tails-installer{,-launcher}
-  python2 setup.py install --root=${pkgdir}
+  cd liveusb-creator
+
+  python2 setup.py install --root="${pkgdir}"
 }
 
 # vim:set ts=2 sw=2 et: