Made the changes Celti suggested.

2 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10c772d05b6d..b44de4fd1376 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 # Generated by mksrcinfo v8
-# Tue Mar 15 18:18:25 UTC 2016
+# Tue May 24 23:38:40 UTC 2016
 pkgbase = systemd-manager-git
-	pkgdesc = A program written with RUST that allow the user to manage their systemd services via a GTK3 GUI.
-	pkgver = r29.724a5e2
+	pkgdesc = A program written with Rust that allows the user to manage their systemd services via a GTK3 GUI.
+	pkgver = 0.4.5.r18.g5bf1bdc
 	pkgrel = 1
 	url = https://github.com/mmstick/systemd-manager/
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = cargo
+	makedepends = git
 	depends = gtk3
 	provides = systemd-manager
+	conflicts = systemd-manager
 	source = systemd-manager-git::git+https://github.com/mmstick/systemd-manager/#branch=master
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index aae170260242..5c63180c912b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,36 @@
 # Maintainer: Daniel Sandman <revoltism@gmail.com>
 
 pkgname=systemd-manager-git
-pkgver=r33.cdab9cc
+pkgver=0.4.5.r18.g5bf1bdc
 pkgrel=1
-pkgdesc="A program written with RUST that allow the user to manage their systemd services via a GTK3 GUI."
+pkgdesc="A program written with Rust that allows the user to manage their systemd services via a GTK3 GUI."
 arch=('i686' 'x86_64')
 url="https://github.com/mmstick/systemd-manager/"
 license=('GPL2')
 depends=('gtk3')
-makedepends=('cargo')
+makedepends=('cargo' 'git')
 provides=('systemd-manager')
 conflicts=('systemd-manager')
 source=("$pkgname::git+https://github.com/mmstick/systemd-manager/#branch=master")
 md5sums=('SKIP')
 
 pkgver() {
-     cd "$srcdir/$pkgname"
-	 echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+	cd "$pkgname"
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+
 build() {
-     cd "$srcdir/$pkgname"
-     # sh install.sh
-     cargo build --release
+	cd "$pkgname"
+	cargo build --release
 }
 
 package() {
-	cd "$srcdir/$pkgname"
+	cd "$pkgname"
 	install -D -m755 target/release/systemd-manager "$pkgdir/usr/bin/systemd-manager"
 	install -D -m755 assets/systemd-manager-pkexec "$pkgdir/usr/bin/systemd-manager-pkexec"
-     	install -D -m644 assets/systemd-manager.desktop "$pkgdir/usr/share/applications/systemd-manager.desktop"
-     	install -D -m644 assets/org.freedesktop.policykit.systemd-manager.policy "$pkgdir/usr/share/polkit-1/actions/org.freedesktop.policykit.systemd-manager.policy"
-     	install -D -m644 README.md "$pkgdir/usr/share/doc/$pkgname/README"
-     	install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+	install -D -m644 assets/systemd-manager.desktop "$pkgdir/usr/share/applications/systemd-manager.desktop"
+	install -D -m644 assets/org.freedesktop.policykit.systemd-manager.policy "$pkgdir/usr/share/polkit-1/actions/org.freedesktop.policykit.systemd-manager.policy"
+	install -D -m644 README.md "$pkgdir/usr/share/doc/$pkgname/README"
+	install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }