wok-next rev 18673
Up tazpkg(884); avant-window-navigator: update receipt; continue with pre/post... functions
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat Dec 05 16:17:00 2015 +0200 (2015-12-05) |
parents | 857cceeac404 |
children | cc264cb074e2 |
files | avant-window-navigator/receipt bridge-utils/receipt broadcom-wl/receipt brscan/receipt brscan2/receipt tazpkg/receipt |
line diff
1.1 --- a/avant-window-navigator/receipt Sat Dec 05 12:23:18 2015 +0100 1.2 +++ b/avant-window-navigator/receipt Sat Dec 05 16:17:00 2015 +0200 1.3 @@ -11,19 +11,17 @@ 1.4 WGET_URL="http://launchpad.net/awn/${VERSION%.*}/$VERSION/+download/$TARBALL" 1.5 TAGS="panel" 1.6 1.7 -DEPENDS="acl dbus dbus-glib librsvg libwnck xorg-xcompmgr libgtop \ 1.8 +DEPENDS="acl dbus-glib librsvg libwnck xorg-xcompmgr libgtop \ 1.9 libdesktop-agnostic" 1.10 -BUILD_DEPENDS="dbus-dev librsvg-dev libwnck-dev pygtk-dev xcb-util-dev \ 1.11 -libxcb-dev startup-notification-dev pycairo-dev pygobject-dev libffi-dev \ 1.12 -python-xdg intltool acl-dev dbus-dev dbus-glib-dev python-dev \ 1.13 -libdesktop-agnostic-dev libgtop-dev GConf-dev" 1.14 +BUILD_DEPENDS="librsvg-dev libwnck-dev pygtk-dev python-xdg intltool \ 1.15 +dbus-glib-dev python-dev libdesktop-agnostic-dev libgtop-dev GConf-dev" 1.16 1.17 # Rules to configure and make the package. 1.18 compile_rules() 1.19 { 1.20 # Binutils 2.22 break many packages build without LDFLAGS set correctly. 1.21 export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries" 1.22 - 1.23 + 1.24 ./configure \ 1.25 --prefix=/usr \ 1.26 --sysconfdir=/etc \ 1.27 @@ -41,33 +39,12 @@ 1.28 cp -a $install/usr/lib/*.so* $fs/usr/lib 1.29 cp -a $install/usr/share/$PACKAGE $fs/usr/share 1.30 cp -a $install/usr/share/applications $fs/usr/share 1.31 - cp -a $install/usr/share/icons/hicolor/32x32/apps \ 1.32 - $fs/usr/share/pixmaps 1.33 + cp -a $install/usr/share/icons $fs/usr/share 1.34 # Custom autostart script so we ensure xcompmgr is also started. 1.35 cat > $fs/usr/bin/awn-autostart << _EOT_ 1.36 #!/bin/sh 1.37 xcompmgr & 1.38 -sleep 4 && avant-window-navigator 1.39 +sleep 4 1.40 +avant-window-navigator 1.41 _EOT_ 1.42 - 1.43 - # split awn-manager 1.44 - rm -f $fs/usr/bin/awn-manager 1.45 - rm -rf $fs/usr/share/$PACKAGE/awn-manager 1.46 - rm -f $fs/usr/share/applications/awn-manager.desktop 1.47 - 1.48 - # fix permissions 1.49 - chmod +x $fs/usr/bin/* 1.50 - 1.51 - # Fix missing icon 1.52 - cd $fs/usr/share/pixmaps 1.53 - ln -s avant-window-navigator.png awn-manager.png 1.54 - 1.55 - 1.56 } 1.57 - 1.58 -post_install() 1.59 -{ 1.60 - # ln missing icons 1.61 - ln -sf go-up.png $1/usr/share/icons/SliTaz/16x16/actions/gtk-sort-ascending.png 1.62 - ln -sf go-down.png $1/usr/share/icons/SliTaz/16x16/actions/gtk-sort-descending.png 1.63 -}
2.1 --- a/bridge-utils/receipt Sat Dec 05 12:23:18 2015 +0100 2.2 +++ b/bridge-utils/receipt Sat Dec 05 16:17:00 2015 +0200 2.3 @@ -6,18 +6,17 @@ 2.4 SHORT_DESC="IEEE 802.1d ethernet bridging" 2.5 MAINTAINER="erjo@slitaz.org" 2.6 LICENSE="GPL2" 2.7 -TARBALL="${PACKAGE}-${VERSION}.tar.gz" 2.8 +TARBALL="$PACKAGE-$VERSION.tar.gz" 2.9 WEB_SITE="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" 2.10 WGET_URL="$SF_MIRROR/bridge/$TARBALL" 2.11 TAGS="ethernet bridge" 2.12 2.13 -BUILD_DEPENDS="autoconf automake" 2.14 +BUILD_DEPENDS="automake" 2.15 2.16 # Rules to configure and make the package. 2.17 compile_rules() 2.18 { 2.19 - cd $src 2.20 - autoconf 2.21 + autoconf 2.22 ./configure --prefix=/usr && 2.23 make && make DESTDIR=$DESTDIR install 2.24 } 2.25 @@ -29,13 +28,7 @@ 2.26 cp -a $install/usr/sbin $fs/usr 2.27 } 2.28 2.29 -# Overlap busybox 2.30 -pre_install() 2.31 -{ 2.32 - rm -f $1/usr/sbin/brctl 2.33 -} 2.34 - 2.35 post_remove() 2.36 { 2.37 - ln -s /bin/busybox $1/usr/sbin/brctl 2.38 + ln -s /bin/busybox "$1/usr/sbin/brctl" 2.39 }
3.1 --- a/broadcom-wl/receipt Sat Dec 05 12:23:18 2015 +0100 3.2 +++ b/broadcom-wl/receipt Sat Dec 05 16:17:00 2015 +0200 3.3 @@ -37,12 +37,10 @@ 3.4 # Post install/remove commands for Tazpkg. 3.5 post_install() 3.6 { 3.7 - echo "Processing post-install commands..." 3.8 - chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 3.9 + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 3.10 } 3.11 3.12 post_remove() 3.13 { 3.14 - echo "Processing post-remove commands..." 3.15 - chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz 3.16 + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 3.17 }
4.1 --- a/brscan/receipt Sat Dec 05 12:23:18 2015 +0100 4.2 +++ b/brscan/receipt Sat Dec 05 16:17:00 2015 +0200 4.3 @@ -71,10 +71,10 @@ 4.4 # Pre and post install and remove commands for Tazpkg. 4.5 post_install() 4.6 { 4.7 - chroot $1/ /usr/local/Brother/sane/setupSaneScan -i 4.8 + chroot "$1/" /usr/local/Brother/sane/setupSaneScan -i 4.9 } 4.10 4.11 pre_remove() 4.12 { 4.13 - chroot $1/ /usr/local/Brother/sane/setupSaneScan -e 4.14 + chroot "$1/" /usr/local/Brother/sane/setupSaneScan -e 4.15 }
5.1 --- a/brscan2/receipt Sat Dec 05 12:23:18 2015 +0100 5.2 +++ b/brscan2/receipt Sat Dec 05 16:17:00 2015 +0200 5.3 @@ -70,10 +70,10 @@ 5.4 # Pre and post install and remove commands for Tazpkg. 5.5 post_install() 5.6 { 5.7 - chroot $1/ /usr/local/Brother/sane/setupSaneScan2 -i 5.8 + chroot "$1/" /usr/local/Brother/sane/setupSaneScan2 -i 5.9 } 5.10 5.11 pre_remove() 5.12 { 5.13 - chroot $1/ /usr/local/Brother/sane/setupSaneScan2 -e 5.14 + chroot "$1/" /usr/local/Brother/sane/setupSaneScan2 -e 5.15 }
6.1 --- a/tazpkg/receipt Sat Dec 05 12:23:18 2015 +0100 6.2 +++ b/tazpkg/receipt Sat Dec 05 16:17:00 2015 +0200 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="tazpkg" 6.7 -VERSION="883" 6.8 +VERSION="884" 6.9 CATEGORY="base-system" 6.10 SHORT_DESC="SliTaz packages manager" 6.11 MAINTAINER="pankso@slitaz.org"