Resolve building problems…

…hopefully.

3 files changed, 32 insertions, 22 deletions

diff --git a/.CHANGELOG b/.CHANGELOG
index 23d624e3793d..b00b6f1457b6 100644
--- a/.CHANGELOG
+++ b/.CHANGELOG
@@ -1,27 +1,33 @@
+* commit dabd2625a9cb2a78db89ff220a97f6eb00eb75d3
+| Author: Lucki <Lucki@holarse-linuxgaming.de>
+| Date:   Tue Aug 22 16:17:05 2017 +0200
+| 
+|     Update README.md
+| 
 * commit 6543845a48bb910f9d501eacbc4216dd4f6ad191
 | Author: Lucki <Lucki@holarse-linuxgaming.de>
 | Date:   Fri Oct 14 16:45:56 2016 +0200
 | 
 |     Dependencies!
-|  
+| 
 * commit acf7fcd204b4c1bebb8c9e8f2b22d6eb73d952db
 | Author: Lucki <Lucki@holarse-linuxgaming.de>
 | Date:   Fri Oct 14 16:23:08 2016 +0200
 | 
 |     Movies!
-|  
+| 
 * commit 4f1e2f344ad9a6ba34863613b1af70804e0e119f
 | Author: Lucki <Lucki@holarse-linuxgaming.de>
 | Date:   Fri Oct 14 15:50:33 2016 +0200
 | 
 |     Fix make, add more to README
-|  
+| 
 * commit 31570e01f20e295db670f6aa831f8af10ac32c44
 | Author: Lucki <Lucki@holarse-linuxgaming.de>
 | Date:   Thu Oct 13 23:04:49 2016 +0200
 | 
 |     Add picture
-|  
+| 
 * commit 0fb936990770136288e790a30e05016f894c262d
   Author: Lucki <Lucki@holarse-linuxgaming.de>
   Date:   Sat Sep 10 16:58:15 2016 +0200
diff --git a/.SRCINFO b/.SRCINFO
index 1b0f03a40349..ea6af18dfe84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,23 @@
 # Generated by mksrcinfo v8
-# Thu Oct 20 17:08:50 UTC 2016
+# Thu Nov 16 00:32:06 UTC 2017
 pkgbase = yaup-git
 	pkgdesc = Yet Another UPnP Portmapper - A GTK frontend for miniupnpc
 	pkgver = 0.1.r1.g6543845
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Holarse-Linuxgaming/yaup
 	changelog = .CHANGELOG
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = git
+	makedepends = gendesk
+	makedepends = intltool
+	makedepends = libtool
 	depends = miniupnpc
 	depends = gtk3
 	provides = yaup
-	source = yaup-git::git+https://github.com/Holarse-Linuxgaming/yaup.git
+	conflicts = yaup
+	source = yaup::git+https://github.com/Holarse-Linuxgaming/yaup.git
 	sha512sums = SKIP
 
 pkgname = yaup-git
diff --git a/PKGBUILD b/PKGBUILD
index de108e28ca35..f13dac35697b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,48 @@
 # Maintainer: Lucki <Lucki at holarse-linuxgaming dot de>
 
 pkgname=yaup-git
-_pkgname=yaup
-
 pkgver=0.1.r1.g6543845
-pkgrel=2
+pkgrel=3
 pkgdesc="Yet Another UPnP Portmapper - A GTK frontend for miniupnpc"
 arch=('i686' 'x86_64')
 url="https://github.com/Holarse-Linuxgaming/yaup"
 license=('GPL3')
 changelog=.CHANGELOG
 depends=('miniupnpc' 'gtk3')
-makedepends=('git')
-provides=('yaup')
-source=(${pkgname}::git+https://github.com/Holarse-Linuxgaming/yaup.git)
+makedepends=('git' 'gendesk' 'intltool' 'libtool')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=(${pkgname%-git}::git+https://github.com/Holarse-Linuxgaming/yaup.git)
 sha512sums=('SKIP')
 
 pkgver()
 {
-	cd "$srcdir/$pkgname"
+	cd "${srcdir}/${pkgname%-git}"
 	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare()
 {
+	cd "${srcdir}"
 	# generate .desktop-file
-	gendesk -n -f --categories "Game"
+	gendesk -n -f --categories "Network;Utility;GTK"
 
 	# update .CHANGELOG
-	git -C ${srcdir}/${pkgname} log --graph -10 > ${startdir}/.CHANGELOG
+	git -C ${srcdir}/${pkgname%-git} log --graph -10 > ${startdir}/.CHANGELOG
 }
 
 build()
 {
-	cd "$srcdir/$pkgname"
-	./configure --prefix=/usr
+	cd "${srcdir}/${pkgname%-git}"
+	./autogen.sh --prefix=/usr
 	make
 }
 
 package()
 {
-	cd "$srcdir/$pkgname"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname%-git}"
+	make DESTDIR="${pkgdir}" install
 
-	install -Dm644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-	install -Dm644 "${srcdir}/${pkgname}/src/${_pkgname}-dark.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
+	install -Dm644 "${srcdir}/${pkgname%-git}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-git}.desktop"
+	install -Dm644 "${srcdir}/${pkgname%-git}/src/${pkgname%-git}-dark.png" "${pkgdir}/usr/share/icons/hicolor/512x512/apps/${pkgname%-git}.png"
 }