Update PKGBUILD to correctly install desktop and manpage files

2 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e95f66325c9f..152e76433798 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = verge-git
 	pkgdesc = VERGE is the privacy focused & secure alternative to other cryptocurrencies. (git version)
 	pkgver = r465.87922b3
-	pkgrel = 1
+	pkgrel = 3
 	url = http://vergecurrency.com/
 	arch = i686
 	arch = x86_64
@@ -36,7 +36,9 @@ pkgbase = verge-git
 	conflicts = verge-bin
 	conflicts = verge-daemon
 	source = git://github.com/vergecurrency/VERGE.git
+	source = https://github.com/vergecurrency/VERGE/pull/40.patch
 	sha256sums = SKIP
+	sha256sums = c608694554c0f303bb0e0f1f8357a1b375a37146a0e59f938866166e2ac0a594
 
 pkgname = verge-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 18e3ab11c77b..af3953d50e47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=verge-git
 _gitname=VERGE
 pkgver=r465.87922b3
-pkgrel=2
+pkgrel=3
 pkgdesc="VERGE is the privacy focused & secure alternative to other cryptocurrencies. (git version)"
 arch=('i686' 'x86_64')
 url="http://vergecurrency.com/"
@@ -12,8 +12,10 @@ depends=('gcc-libs' 'miniupnpc' 'openssl' 'db4.8' 'protobuf')
 makedepends=('pkg-config' 'git' 'qt5-webkit' 'qt5-base' 'qt5-tools' 'boost-libs' 'boost' 'gcc' 'qrencode' 'make' 'automoc4' 'automake' 'autoconf' 'libtool')
 provides=('verge' 'verge-qt' 'verged' 'verge-bin' 'verge-daemon')
 conflicts=('verge' 'verge-qt' 'verged' 'verge-bin' 'verge-daemon')
-source=('git://github.com/vergecurrency/VERGE.git')
-sha256sums=('SKIP')
+source=('git://github.com/vergecurrency/VERGE.git'
+        'https://github.com/vergecurrency/VERGE/pull/40.patch')
+sha256sums=('SKIP'
+            'c608694554c0f303bb0e0f1f8357a1b375a37146a0e59f938866166e2ac0a594')
 
 pkgver() {
 	cd "$srcdir/$_gitname"
@@ -26,8 +28,7 @@ pkgver() {
 prepare() {
 	cd "$srcdir/$_gitname"
 	msg2 "Fixing verge-qt.desktop icons so we don't conflict with bitcoin"
-	grep -rl Icon contrib/debian/verge-qt.desktop | xargs sed -i 's/bitcoin80/verge80/g'
-	grep -rl Exec contrib/debian/verge-qt.desktop | xargs sed -i 's/verge-qt/VERGE-qt/g'
+	git apply "$srcdir"/40.patch
 }
 
 build() {
@@ -41,15 +42,15 @@ package() {
 	# install verge-qt client
 	msg2 'Installing verge-qt...'
 	install -Dm755 "$srcdir/$_gitname/src/qt/VERGE-qt" "$pkgdir/usr/bin/VERGE-qt"
-	install -Dm644 "$srcdir/$_gitname/share/pixmaps/bitcoin80.xpm" "$pkgdir/usr/share/pixmaps/verge80.xpm"
-	desktop-file-install -m 644 --dir="$pkgdir/usr/share/applications/" "$srcdir/$_gitname/contrib/debian/verge-qt.desktop"
+	install -Dm644 "$srcdir/$_gitname/share/pixmaps/verge80.xpm" "$pkgdir/usr/share/pixmaps/verge80.xpm"
+	desktop-file-install -m 644 --dir="$pkgdir/usr/share/applications/" "$srcdir/$_gitname/contrib/debian/VERGE-qt.desktop"
 
 	# install verge-daemon
 	msg2 'Installing verge-daemon...'
 	install -Dm755 "$srcdir/$_gitname/src/VERGEd" "$pkgdir/usr/bin/VERGEd"
-	install -Dm644 "$srcdir/$_gitname/contrib/debian/examples/novacoin.conf" "$pkgdir/usr/share/doc/$pkgname/examples/VERGE.conf"
-	install -Dm644 "$srcdir/$_gitname/contrib/debian/manpages/verged.1" "$pkgdir/usr/share/man/man1/verged.1"
-	install -Dm644 "$srcdir/$_gitname/contrib/debian/manpages/verge.conf.5" "$pkgdir/usr/share/man/man5/verge.conf.5"
+	install -Dm644 "$srcdir/$_gitname/contrib/debian/examples/VERGE.conf" "$pkgdir/usr/share/doc/$pkgname/examples/VERGE.conf"
+	install -Dm644 "$srcdir/$_gitname/contrib/debian/manpages/VERGEd.1" "$pkgdir/usr/share/man/man1/VERGEd.1"
+	install -Dm644 "$srcdir/$_gitname/contrib/debian/manpages/VERGE.conf.5" "$pkgdir/usr/share/man/man5/VERGE.conf.5"
 
 	# install license
 	install -D -m644 "$srcdir/$_gitname/COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING"