From 4aef11767febf2d3a29d811b6460de1895b0185f Mon Sep 17 00:00:00 2001 From: Brian Bidulock Date: Thu, 31 Mar 2016 14:44:44 -0600 Subject: [PATCH] version 1:6.1.2.g3465bed-2 --- .SRCINFO | 4 ++-- PKGBUILD | 25 ++++++++++++++----------- dwm.install | 1 + 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7c756b2..c8aa872 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Mar 20 05:50:52 UTC 2016 +# Thu Mar 31 20:44:15 UTC 2016 pkgbase = dwm-git pkgdesc = A dynamic window manager for X pkgver = 6.1.2.g3465bed - pkgrel = 1 + pkgrel = 2 epoch = 1 url = http://dwm.suckless.org install = dwm.install diff --git a/PKGBUILD b/PKGBUILD index 8459e99..5068227 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,11 +1,7 @@ pkgname=dwm-git _pkgname=dwm pkgver=6.1.2.g3465bed -pkgver(){ - cd $_pkgname - git describe --tags |sed 's/-/./g' -} -pkgrel=1 +pkgrel=2 pkgdesc="A dynamic window manager for X" url="http://dwm.suckless.org" arch=('i686' 'x86_64') @@ -22,9 +18,15 @@ source=(dwm.desktop md5sums=('939f403a71b6e85261d09fc3412269ee' 'SKIP') +pkgver(){ + cd $_pkgname + git describe --tags |sed 's/-/./g' +} + prepare() { - if [[ -f $SRCDEST/config.h ]]; then - cp $SRCDEST/config.h $srcdir/dwm/config.h + cd $_pkgname + if [[ -f "$SRCDEST/$pkgname/config.h" ]]; then + cp -f "$SRCDEST/$pkgname/config.h" config.h fi } @@ -34,10 +36,11 @@ build() { } package() { - make -C $_pkgname PREFIX=/usr DESTDIR=$pkgdir install - install -m644 -D $_pkgname/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - install -m644 -D $_pkgname/README $pkgdir/usr/share/doc/$pkgname/README - install -m644 -D $srcdir/dwm.desktop $pkgdir/usr/share/xsessions/dwm.desktop + cd $_pkgname + make PREFIX=/usr DESTDIR="$pkgdir" install + install -m644 -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -m644 -D README "$pkgdir/usr/share/doc/$pkgname/README" + install -m644 -D ../dwm.desktop "$pkgdir/usr/share/xsessions/dwm.desktop" } # vim:set ts=2 sw=2 et: diff --git a/dwm.install b/dwm.install index 44b50ed..9675514 100644 --- a/dwm.install +++ b/dwm.install @@ -1,4 +1,5 @@ post_install() { echo "-- Edit config.h in dwm's PKGBUILD directory (generally /var/abs/community/dwm/)" echo "-- and rebuild package if you want to change settings." + echo "-- Or, place custom config.h in \$SRCDEST/dwm-git/config.h and rebuild." } -- 2.41.0