AUR4 split: Reworked netradiant-git + now maintainer

1 files changed, 27 insertions, 27 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a02d517d81b2..43d3ff421b07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,37 @@
-# Contributor: J0k3r <moebius282 at gmail dot com>
-# Contributor: Marcel Pfeiffer <pfeiffer.marcel at gmx dot de>
-# Contributor: epsy < epsy46 at free dot fr >
+# Maintainer: J0k3r <moebius282 at gmail dot com>
 
 pkgname=netradiant-git
-pkgver=1334
+pkgver=r1351.e995cc8
 pkgrel=1
 epoch=1
 pkgdesc="A Stabilized Q3 Map Editor - git version"
-arch=('i686' 'x86_64')
 url="http://dev.xonotic.org/projects/xonotic/wiki/Netradiant"
 license=('GPL' 'BSD' 'LGPL')
-depends=('gtk2' 'gtkglext' 'libxml2' 'zlib' 'libpng')
-options=()
-makedepends=('svn')
+arch=('i686' 'x86_64')
+changelog="${pkgname}.changelog"
+depends=('gtkglext')
+makedepends=('git' 'svn' 'wget' 'unzip')
 provides=('netradiant')
-conflicts=('netradiant-svn-unfree' 'netradiant-svn' 'netradiant-bin32')
+conflicts=('netradiant-bin32' 'netradiant-svn' 'netradiant-latest' 'netradiant-unfree-svn')
 source=("${pkgname}::git://git.xonotic.org/xonotic/netradiant.git"
-		"netradiant.desktop")
-sha256sums=('SKIP'
-			'e462d733d2c9136f4b9648573065b457e80568fddafd331c0cac895994049454')
+		"${pkgname}.desktop"
+		"${pkgname}.changelog")
+sha256sums=("SKIP"
+			"ec5829cf3a88f3ff63e45b9e412576cb65463932984953f8698162abaea40e09"
+			"SKIP")
 
 pkgver()
 {
-  cd "${srcdir}/${pkgname}/"
-  echo $(git rev-list --count master)
+	cd "${srcdir}/${pkgname}/"
+
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build()
 {
 	cd "${srcdir}/${pkgname}/"
+
+	## Needs Internet, downloads gamepacks
 	make
 }
 
@@ -36,21 +39,18 @@ package()
 {
 	cd "${srcdir}/${pkgname}/"
 
-	mkdir -p "${pkgdir}/opt/"
-	mkdir -p "${pkgdir}/usr/bin/"
-
-	mv "install/" "${pkgdir}/opt/${pkgname}/"
+	## We name the folder just netradiant, so the different GamePack addon packages still work
+	install -d "${pkgdir}/opt/netradiant/"
+	install -d "${pkgdir}/usr/bin/"
 
-	cat > "${pkgdir}/usr/bin/netradiant" <<-EOF
-		#!/bin/bash
+	## for Repackage support
+	cp -r install/* "${pkgdir}/opt/netradiant/"
 
-		cd "/opt/${pkgname}/"
-		./radiant.x86
-	EOF
+	ln -s "/opt/netradiant/radiant" "${pkgdir}/usr/bin/netradiant"
+	## You can probably also link q3map2 for convenience to /usr/bin, but I did not test that it works correctly.
+	## The old PKGBUILD had a script that switches to the directory first, because of 'weird behaviour'. Keep that in mind.
+	## Also this would make us conflict with other *Radiant packages like GtkRadiant if they would do the same.
 
-	chmod 0755 "${pkgdir}/usr/bin/netradiant"
-
-	install -Dm644 "${srcdir}/netradiant.desktop" "${pkgdir}/usr/share/applications/netradiant.desktop"
+	install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 	install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
 }