wok-next rev 20278
Up cups, samba, warzone2100
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Wed Nov 08 13:44:17 2017 +0200 (2017-11-08) |
parents | e1cdb9fa8aa4 |
children | 226eee678237 |
files | cups/receipt samba/receipt warzone2100/receipt |
line diff
1.1 --- a/cups/receipt Wed Nov 08 10:43:54 2017 +0100 1.2 +++ b/cups/receipt Wed Nov 08 13:44:17 2017 +0200 1.3 @@ -170,9 +170,34 @@ 1.4 } 1.5 1.6 post_install_cups_pam() { 1.7 - post_install_cups "$1" 1.8 + # Start CUPS daemon 1.9 + if [ -z "$1" -a ! -s /aufs-umount.sh ]; then 1.10 + /etc/init.d/cupsd start || continue 1.11 + fi 1.12 + 1.13 + # Clean TazPanel menu cache 1.14 + rm -f "$1"/var/cache/tazpanel/* 2>/dev/null 1.15 + 1.16 + # Edit daemons.conf 1.17 + if ! grep -q ^CUPSD_OPTIONS "$1/etc/daemons.conf"; then 1.18 + cat >> "$1/etc/daemons.conf" <<EOT 1.19 +# CUPS printing daemon options. 1.20 +CUPSD_OPTIONS="" 1.21 + 1.22 +EOT 1.23 + fi 1.24 + 1.25 + # Add lpadmin group 1.26 + addgroup -g 23 lpadmin 1.27 + 1.28 + # Return permissions to previous state 1.29 + chmod 640 $1/etc/cups/* 1.30 + chmod 700 $1/usr/lib/cups/backend/ipp $1/usr/lib/cups/backend/lpd 1.31 + chmod 500 $1/usr/sbin/cupsd 1.32 } 1.33 1.34 pre_remove_cups_pam() { 1.35 - pre_remove_cups "$1" 1.36 + # Stop CUPS daemon before rm. 1.37 + [ -z "$1" -a -x /etc/init.d/cupsd ] && /etc/init.d/cupsd stop 1.38 + : 1.39 }
2.1 --- a/samba/receipt Wed Nov 08 10:43:54 2017 +0100 2.2 +++ b/samba/receipt Wed Nov 08 13:44:17 2017 +0200 2.3 @@ -56,7 +56,7 @@ 2.4 --without-systemd \ 2.5 --enable-selftest \ 2.6 $CONFIGURE_ARGS && 2.7 - make && make DESTDIR=install-pam || return 1 2.8 + make && make DESTDIR=install-pam install || return 1 2.9 2.10 for inst in $install $install-pam ; do 2.11 mkdir -p $inst/lib
3.1 --- a/warzone2100/receipt Wed Nov 08 10:43:54 2017 +0100 3.2 +++ b/warzone2100/receipt Wed Nov 08 13:44:17 2017 +0200 3.3 @@ -1,28 +1,28 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="warzone2100" 3.7 -VERSION="2.3.9" 3.8 +VERSION="3.2.3" 3.9 CATEGORY="games" 3.10 SHORT_DESC="3D realtime strategy game on a future Earth" 3.11 MAINTAINER="slaxemulator@gmail.com" 3.12 LICENSE="GPL2" 3.13 -TARBALL="$PACKAGE-$VERSION.tar.gz" 3.14 +TARBALL="$PACKAGE-$VERSION.tar.xz" 3.15 WEB_SITE="http://wz2100.net/" 3.16 WGET_URL="$SF_MIRROR/warzone2100/releases/$VERSION/$TARBALL" 3.17 3.18 DEPENDS="libsdl-net mesa openal jpeg libpng libvorbis libtheora libmad physfs \ 3.19 quesoglc popt ttf-dejavu ttf-dejavu-extra" 3.20 -BUILD_DEPENDS="libsdl-dev libsdl-net-dev mesa-dev openal openal-dev jpeg-dev \ 3.21 -libpng-dev libogg-dev libvorbis-dev libtheora-dev libmad-dev physfs-dev \ 3.22 -quesoglc-dev popt-dev gawk bison flex zip unzip pkg-config zlib-dev \ 3.23 -libglu-mesa-dev" 3.24 +BUILD_DEPENDS="automake perl zip gettext qt5-dev xorg-libX11-dev libsdl2-dev \ 3.25 +libpng16-dev libtheora-dev openal-dev libvorbis-dev glew-dev mesa17-dev \ 3.26 +libcrypto-dev physfs-dev xorg-libXrandr-dev fribidi-dev freetype-dev \ 3.27 +fontconfig-dev openssl-dev git" 3.28 3.29 # Rules to configure and make the package. 3.30 compile_rules() 3.31 { 3.32 - cd $src 3.33 + autogen.sh && 3.34 ./configure \ 3.35 - --disable-motif \ 3.36 + --with-distributor="SliTaz" \ 3.37 $CONFIGURE_ARGS && 3.38 make && make DESTDIR=$DESTDIR install 3.39 } 3.40 @@ -30,10 +30,10 @@ 3.41 # Rules to gen a SliTaz package suitable for Tazpkg. 3.42 genpkg_rules() 3.43 { 3.44 - mkdir -p $fs/usr/share/pixmaps 3.45 - cp -a $install/usr/bin $fs/usr 3.46 - cp -a $install/usr/share/applications $fs/usr/share 3.47 - cp -a $install/usr/share/icons/warzone2100.png $fs/usr/share/pixmaps 3.48 - cp -a $install/usr/share/warzone2100 $fs/usr/share 3.49 + copy @std 3.50 +# mkdir -p $fs/usr/share/pixmaps 3.51 +# cp -a $install/usr/bin $fs/usr 3.52 +# cp -a $install/usr/share/applications $fs/usr/share 3.53 +# cp -a $install/usr/share/icons/warzone2100.png $fs/usr/share/pixmaps 3.54 +# cp -a $install/usr/share/warzone2100 $fs/usr/share 3.55 } 3.56 -