[arch-commits] Commit in dzen2/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Friday, September 12, 2014 @ 14:13:06
  Author: spupykin
Revision: 118859

upgpkg: dzen2 0.9.5git-4

upd

Modified:
  dzen2/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-12 11:24:51 UTC (rev 118858)
+++ PKGBUILD	2014-09-12 12:13:06 UTC (rev 118859)
@@ -4,7 +4,7 @@
 
 pkgname=dzen2
 pkgver=0.9.5git
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 pkgdesc="X notification utility"
 url="https://github.com/robm/dzen"
@@ -14,16 +14,20 @@
 source=("$pkgname-$pkgver::git://github.com/robm/dzen")
 md5sums=('SKIP')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
+  sed -i 's|DZEN_XMP|DZEN_XPM|g' main.c
 
-  CFLAGS=" -Wall -Os \${INCS} -DVERSION=\\\"\${VERSION}\\\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`"
+  CFLAGS="$CFLAGS -Wall -Os \${INCS} -DVERSION=\\\"\${VERSION}\\\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`"
   LIBS=" -L/usr/lib -lc -lXft -lXpm -lXinerama -lX11"
 
   echo "CFLAGS=$CFLAGS" >>config.mk
   echo "LIBS=$LIBS" >>config.mk
-  echo "LDFLAGS=$LIBS" >>config.mk
+  echo "LDFLAGS=$LDFLAGS $LIBS" >>config.mk
+}
 
+build() {
+  cd $srcdir/$pkgname-$pkgver
   make X11INC=/usr/include X11LIB=/usr/lib
   (cd gadgets && make X11INC=/usr/include X11LIB=/usr/lib)
 }
@@ -32,5 +36,8 @@
   cd $srcdir/$pkgname-$pkgver
   make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install
   (cd gadgets && make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install)
-  install -m644 -D LICENSE $pkgdir/usr/share/licenses/dzen2/COPYING
+  install -Dm0644 LICENSE $pkgdir/usr/share/licenses/dzen2/COPYING
+
+  install -dm0644 $pkgdir/usr/share/doc/dzen2
+  install -m0644 README* $pkgdir/usr/share/doc/dzen2/
 }