adopted, smoall changes

1 files changed, 20 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fa905b491326..0f1b216e5fc7 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
-# Maintainer: Emersion <contact at emersion dot fr>
+# Contributor: Emersion <contact at emersion dot fr>
 # https://github.com/emersion/aur-markmywords
 #
 # Author: voldyman <voldyman666 at gmail dot com>
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 _gitname="MarkMyWords"
 _pkgname="markmywords"
 pkgname="${_pkgname}-git"
-pkgver=d6f19f4
+pkgver=0.1.3.4.g970b459
 pkgrel=1
 pkgdesc="A minimal markdown editor. It is currently under heavy development."
 url="https://github.com/voldyman/MarkMyWords"
 arch=('i686' 'x86_64')
-license=('None')
+license=('custom')
 depends=('gtksourceview3' 'glib2' 'gtk3' 'webkit2gtk')
 makedepends=('vala' 'gobject-introspection' 'cmake')
 conflicts=("${_pkgname}")
@@ -21,21 +22,26 @@ source=("git://github.com/voldyman/MarkMyWords.git")
 md5sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${_gitname}"
-	git describe --always | sed 's|-|.|g' | sed 's|_|.|g' | cut -d'.' -f2-
+  cd "${srcdir}/${_gitname}"
+  git describe --tags | cut -c2- | sed 's+-+.+g' 
+}
+
+prepare() {
+  cd "${srcdir}/${_gitname}"
+  sed -i "s|webkit2gtk-3.0|webkit2gtk-4.0|g" CMakeLists.txt
 }
 
 build() {
-	cd "${srcdir}/${_gitname}"
-	sed -i "s|webkit2gtk-3.0|webkit2gtk-4.0|g" CMakeLists.txt
-    
-	# See https://github.com/voldyman/MarkMyWords#how-to-build
-	mkdir build && cd build
-	cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=/usr ../
-	make
+  cd "${srcdir}/${_gitname}"
+  # See https://github.com/voldyman/MarkMyWords#how-to-build
+  [[ -d build ]] || mkdir build
+  cd build
+  cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=/usr ../
+  make
 }
 
 package() {
-	cd "${srcdir}/${_gitname}/build"
-	make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${_gitname}/build"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }