wok diff jwm/receipt @ rev 12586
json-glib: update bdeps
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Apr 28 21:40:19 2012 +0200 (2012-04-28) |
parents | 8e410d8c4dd2 |
children | 7bb096863642 |
line diff
1.1 --- a/jwm/receipt Tue Apr 17 12:29:55 2012 +0200 1.2 +++ b/jwm/receipt Sat Apr 28 21:40:19 2012 +0200 1.3 @@ -8,11 +8,12 @@ 1.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.5 WEB_SITE="http://www.joewing.net/programs/jwm/" 1.6 WGET_URL="http://www.joewing.net/programs/jwm/releases/$TARBALL" 1.7 -CONFIG_FILES="/etc/jwm/system.jwmrc" 1.8 TAGS="wm window-manager" 1.9 1.10 -DEPENDS="xorg slitaz-configs" 1.11 -BUILD_DEPENDS="xorg-dev xorg-libXft-dev jpeg-dev" 1.12 +DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \ 1.13 +xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \ 1.14 +libpng slitaz-configs-base xorg-xload xorg-xclock nano" 1.15 +BUILD_DEPENDS="xorg-dev xorg-libXft-dev jpeg-dev libpng-dev" 1.16 1.17 # Rules to configure and make the package. 1.18 compile_rules() 1.19 @@ -23,7 +24,7 @@ 1.20 ./configure \ 1.21 --prefix=/usr \ 1.22 --mandir=/usr/share/man \ 1.23 - --sysconfdir=/etc/jwm \ 1.24 + --sysconfdir=/etc/xdg/jwm \ 1.25 --disable-fribidi \ 1.26 $CONFIGURE_ARGS && 1.27 make 1.28 @@ -32,15 +33,20 @@ 1.29 # Rules to gen a SliTaz package suitable for Tazpkg. 1.30 genpkg_rules() 1.31 { 1.32 - mkdir -p $fs/usr/bin $fs/etc/jwm 1.33 + mkdir -p $fs/usr/bin $fs/etc/xdg/jwm $fs/usr/share 1.34 cp -a $src/src/jwm $fs/usr/bin 1.35 # Simple and default config file. 1.36 - cp $stuff/simple.jwmrc $fs/etc/jwm/simple.jwmrc 1.37 - cp $stuff/slitaz.jwmrc $fs/etc/jwm/system.jwmrc 1.38 + cp $stuff/simple.jwmrc $fs/etc/xdg/jwm/simple.jwmrc 1.39 + cp $stuff/slitaz.jwmrc $fs/etc/xdg/jwm/system.jwmrc 1.40 + cp -r $stuff/xsessions $fs/usr/share 1.41 } 1.42 1.43 post_install() 1.44 { 1.45 + if [ -d "$1/etc/jwm" ]; then 1.46 + echo "Removing old system wide configs: $1/etc/jwm" 1.47 + rm -rf $1/etc/jwm 1.48 + fi 1.49 res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//) 1.50 # Adding WM to SLIM available sessions. 1.51 if ! echo "$res" | grep -q $PACKAGE; then