fixes & cleanup

2 files changed, 13 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93da1f0ad591..9dcea6dd1664 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = battery-monitor-devel-git
 	pkgdesc = A utility tool, notifies user about charging, discharging and not charging state of the battery on Linux.
 	pkgver = 0.5.3.r34.gf7a83dd
-	pkgrel = 7
+	pkgrel = 8
 	url = https://github.com/maateen/battery-monitor
 	arch = any
 	license = GPL3
@@ -11,9 +11,7 @@ pkgbase = battery-monitor-devel-git
 	depends = libnotify
 	depends = libappindicator-gtk3
 	provides = battery-monitor
-	conflicts = battery-monitor
-	conflicts = battery-monitor-git
-	source = battery-monitor-devel-git::git+https://github.com/maateen/battery-monitor.git#branch=devel
+	source = git+https://github.com/maateen/battery-monitor.git#branch=devel
 	md5sums = SKIP
 
 pkgname = battery-monitor-devel-git
diff --git a/PKGBUILD b/PKGBUILD
index 92e1c8bc465f..bbb71bec2aed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,27 @@
 # Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
 pkgname=battery-monitor-devel-git
+_gitname=battery-monitor
 pkgver=0.5.3.r34.gf7a83dd
-pkgrel=7
+pkgrel=8
 pkgdesc='A utility tool, notifies user about charging, discharging and not charging state of the battery on Linux.'
 arch=('any')
 url="https://github.com/maateen/battery-monitor"
 license=('GPL3')
 depends=('acpi' 'python' 'python-gobject' 'libnotify' 'libappindicator-gtk3')
-conflicts=('battery-monitor' 'battery-monitor-git')
 provides=('battery-monitor')
-source=("$pkgname"::'git+https://github.com/maateen/battery-monitor.git#branch=devel')
+source=('git+https://github.com/maateen/battery-monitor.git#branch=devel')
 md5sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$pkgname"
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ 	cd "$srcdir/$_gitname"
+ 	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 package() {
-	cd "$srcdir/$pkgname"
-	install -d "$pkgdir/"usr/{bin,share}/battery-monitor
-	cp -a src/. "$pkgdir/usr/share/battery-monitor"
-	install -Dm755 battery-monitor "$pkgdir/usr/bin/battery-monitor"
-	install -Dm755 battery-monitor-autostart.desktop "$pkgdir/etc/xdg/autostart/battery-monitor-autostart.desktop"
-	install -Dm755 battery-monitor.desktop "$pkgdir/usr/share/applications/battery-monitor.desktop"
+	cd "$srcdir/$_gitname"
+	install -d "$pkgdir/"usr/{bin,share/battery-monitor}
+	cp -a src/. "$pkgdir/usr/share/$_gitname"
+	install -Dm755 "$_gitname" "$pkgdir/usr/bin/$_gitname"
+	install -Dm644 "$_gitname-autostart.desktop" "$pkgdir/etc/xdg/autostart/$_gitname-autostart.desktop"
+	install -Dm644 "$_gitname.desktop" "$pkgdir/usr/share/applications/$_gitname.desktop"
 }