Updated: PKGBUILD

2 files changed, 30 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57d478656484..f763ab1bd3fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 pkgbase = msitools-git
-	pkgdesc = Set of programs to inspect and build Windows Installer (.MSI) files
-	pkgver = r694.c7b6840
+	pkgdesc = Set of programs to inspect and build Windows Installer (.MSI) files (Git)
+	pkgver = r825.7ac1e76
 	pkgrel = 1
 	url = https://wiki.gnome.org/msitools
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = intltool
+	makedepends = git
 	makedepends = vala
 	depends = libgsf
 	depends = gcab
 	provides = msitools
 	conflicts = msitools
-	source = git+https://github.com/GNOME/msitools
+	source = git+https://github.com/GNOME/msitools.git
 	sha256sums = SKIP
 
 pkgname = msitools-git
diff --git a/PKGBUILD b/PKGBUILD
index f76205d364a2..393dea89a9e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,45 @@
+# Maintainer:
+# Contributor: Felix Golatofski <contact@xdfr.de>
 # Contributor: Andre Klitzing <aklitzing () gmail () com>
 
-_gitname=msitools
-pkgname=$_gitname-git
-pkgver=r694.c7b6840
+_pkgname=msitools
+pkgname=$_pkgname-git
+pkgver=r825.7ac1e76
 pkgrel=1
-pkgdesc="Set of programs to inspect and build Windows Installer (.MSI) files"
+pkgdesc="Set of programs to inspect and build Windows Installer (.MSI) files (Git)"
 arch=('i686' 'x86_64')
 url="https://wiki.gnome.org/msitools"
 license=('GPL')
 depends=('libgsf' 'gcab')
+makedepends=('intltool' 'git' 'vala')
 conflicts=('msitools')
 provides=('msitools')
-makedepends=('intltool' 'vala')
-source=(git+https://github.com/GNOME/msitools)
+source=(git+https://github.com/GNOME/msitools.git)
 sha256sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${_gitname}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${_pkgname}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd "$srcdir/$_pkgname"
+  git submodule update --init --recursive
 }
 
 build() {
-  cd "$srcdir/$_gitname"
-  ./autogen.sh
-  ./configure --prefix=/usr
-  sed -i 's|LIBTOOL = $(SHELL) $(top_builddir)/libtool|LIBTOOL = /usr/bin/libtool|g' Makefile
-  make
+  cd "$srcdir/$_pkgname"
+  arch-meson $srcdir/$_pkgname build
+  ninja -C build
+
+}
+
+check() {
+  meson test -C $srcdir/$_pkgname/build
 }
 
 package() {
-  cd "$srcdir/$_gitname"
-  make install DESTDIR="${pkgdir}"
+  cd "$srcdir/$_pkgname"
+  DESTDIR="$pkgdir" meson install -C $srcdir/$_pkgname/build
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
 }