Standardize format of compiz git PKGBUILDs

1 files changed, 10 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 06c6c39232b1..a5cbbd22d5d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,14 @@
 # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
 # Contributor: nesl247 <nesl247@gmail.com>
 
+_upstream="emerald"
+
 pkgname=emerald-git
-pkgver=0.8.12.2.r13.g6f3c2e1
+pkgver=0.8.12.4.r2.gee2031a
 pkgrel=1
 pkgdesc="Emerald window decorator"
 arch=('i686' 'x86_64')
-url="https://github.com/compiz-reloaded/emerald"
+url="https://github.com/compiz-reloaded/${_upstream}"
 license=('GPL')
 depends=('compiz-core-git' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \
          'desktop-file-utils' 'hicolor-icon-theme')
@@ -20,24 +22,25 @@ conflicts=('emerald0.9' 'emerald')
 provides=('emerald')
 install=emerald.install
 source=(
-	'git+https://github.com/compiz-reloaded/emerald.git'
+	"git+https://github.com/compiz-reloaded/${_upstream}.git"
 )
 sha1sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname%%-git}"
+	cd "${srcdir}/${_upstream}"
 	git describe --long --tags|sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "${srcdir}/${pkgname%%-git}"
+  cd "${srcdir}/${_upstream}"
 
-  LIBS+="-lm -ldl" ./autogen.sh --prefix=/usr --with-gtk=2.0
+  NOCONFIGURE=1 ./autogen.sh
+  LIBS+="-lm -ldl" ./configure --prefix=/usr --with-gtk=2.0
 
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname%%-git}"
+  cd "${srcdir}/${_upstream}"
   make DESTDIR="${pkgdir}" install
 }