summaryrefslogtreecommitdiff
path: root/desktop/bspwm/bspwm.SlackBuild
diff options
context:
space:
mode:
authorJohn Vogel <jvogel4@stny.rr.com>2014-06-10 06:26:37 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-06-12 06:51:48 +0700
commit15c6d7579d8357b36c7d56e7a44566544335fe69 (patch)
tree396786f2e275f163d82af7a8779bddc96023e9a0 /desktop/bspwm/bspwm.SlackBuild
parentbe7f8252feabef1eee69ca8218e94abad1a965b5 (diff)
downloadslackbuilds-15c6d7579d8357b36c7d56e7a44566544335fe69.tar.gz
desktop/bspwm: Pull upstream fixes.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'desktop/bspwm/bspwm.SlackBuild')
-rw-r--r--desktop/bspwm/bspwm.SlackBuild13
1 files changed, 9 insertions, 4 deletions
diff --git a/desktop/bspwm/bspwm.SlackBuild b/desktop/bspwm/bspwm.SlackBuild
index f5ce09ca24..2aaeb1111f 100644
--- a/desktop/bspwm/bspwm.SlackBuild
+++ b/desktop/bspwm/bspwm.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=bspwm
VERSION=${VERSION:-0.8.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -60,7 +60,12 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+if [ ! -f $CWD/$PRGNAM-$VERSION.tar.gz ]; then
+ if [ -f $CWD/$VERSION.tar.gz ]; then
+ mv $CWD/$VERSION.tar.gz $CWD/$PRGNAM-$VERSION.tar.gz
+ fi
+fi
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,8 +74,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# patch to git commit 0ca5bf31 (use -l due to major spaces to tabs conversion in Jan 2014)
-patch -l -p1 < $CWD/patches/bspwm-0.8.8_0ca5bf3.patch
+# patch to git commit 0ff26c34 (use -l due to major spaces to tabs conversion in Jan 2014)
+patch -l -p1 < $CWD/patches/bspwm-0.8.8_0ff26c34.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \