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

[Andreas Radke]

    Date: Sunday, July 27, 2014 @ 12:14:21
  Author: andyrtr
Revision: 218219

upgpkg: xorg-twm 1.0.8-2

fix duplicate config file location; FS#41094

Modified:
  xorg-twm/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-27 09:22:34 UTC (rev 218218)
+++ PKGBUILD	2014-07-27 10:14:21 UTC (rev 218219)
@@ -1,10 +1,10 @@
 # $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-twm
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Tab Window Manager for the X Window System"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,19 +12,24 @@
 license=('custom')
 depends=('libxmu')
 makedepends=('xorg-util-macros')
+options=('!emptydirs')
 source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2)
 sha256sums=('7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44')
 
 build() {
-  cd "${srcdir}/twm-${pkgver}"
+  cd twm-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/twm-${pkgver}"
+  cd twm-${pkgver}
   make DESTDIR="${pkgdir}" install
+
+  # fix config file location
   install -m755 -d "${pkgdir}/etc/X11/twm"
   install -m644 src/system.twmrc "${pkgdir}/etc/X11/twm/"
+  rm $pkgdir/usr/share/X11/twm/system.twmrc
+  
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }