wok diff slitaz-configs/receipt @ rev 16421

slitaz-*-configs*: Update receipt
author Christophe Lincoln <pankso@slitaz.org>
date Fri Apr 18 04:11:16 2014 +0200 (2014-04-18)
parents 1100bf6b113a
children d524a624d834
line diff
     1.1 --- a/slitaz-configs/receipt	Mon Apr 14 19:59:46 2014 +0200
     1.2 +++ b/slitaz-configs/receipt	Fri Apr 18 04:11:16 2014 +0200
     1.3 @@ -2,7 +2,6 @@
     1.4  
     1.5  PACKAGE="slitaz-configs"
     1.6  VERSION="5.4"
     1.7 -ARM_VERS="0.3"
     1.8  CATEGORY="base-system"
     1.9  SHORT_DESC="SliTaz config files and artwork."
    1.10  MAINTAINER="pankso@slitaz.org"
    1.11 @@ -10,7 +9,6 @@
    1.12  WEB_SITE="http://www.slitaz.org/"
    1.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.14  WGET_URL="http://hg.slitaz.org/slitaz-configs/archive/$VERSION.tar.gz"
    1.15 -CONFIG_FILES="/etc/slitaz/applications.conf"
    1.16  HOST_ARCH="i486 arm"
    1.17  
    1.18  DEPENDS="slitaz-configs-base xorg-libXcomposite xorg-libXdamage \
    1.19 @@ -19,19 +17,8 @@
    1.20  # Special case for ARM since some (most) config files are in slitaz-arm repo.
    1.21  # i486/arm common configs are provided by slitaz-configs-base.
    1.22  case "$SLITAZ_ARCH" in
    1.23 -	arm*)
    1.24 -		VERSION="$ARM_VERS"
    1.25 -		WEB_SITE="http://arm.slitaz.org/"
    1.26 -		DEPENDS="slitaz-configs-base ttf-dejavu slim" 
    1.27 -		CONFIG_FILES="/etc/slitaz/applications.conf /etc/rcS.conf" ;;
    1.28 -esac
    1.29 -
    1.30 -case "$ARCH" in
    1.31 -	arm*)
    1.32 -		VERSION="$ARM_VERS"
    1.33 -		WEB_SITE="http://arm.slitaz.org/"
    1.34 -		TARBALL="$PACKAGE-arm-$VERSION.tar.bz2"
    1.35 -		WGET_URL="http://hg.slitaz.org/slitaz-arm/archive/tip.tar.bz2" ;;
    1.36 +	i?86) CONFIG_FILES="/etc/slitaz/applications.conf" ;;
    1.37 +	i?86) DEPENDS="$DEPENDS slitaz-arm-configs" ;;
    1.38  esac
    1.39  
    1.40  # Rules to configure and make the package.
    1.41 @@ -59,14 +46,16 @@
    1.42  			do
    1.43  				cp -r $src/rootfs/usr/share/$i $fs/usr/share
    1.44  			done
    1.45 -		
    1.46  			cp -a $src/rootfs/usr/bin $fs/usr
    1.47  			cp -a $src/rootfs/etc/lxpanel $fs/etc
    1.48  			cp -a $src/rootfs/etc/slitaz $fs/etc
    1.49 -			cp -a $install/etc/xdg/openbox/menu.en.xml $install/etc/xdg/openbox/menu.xml \
    1.50 +			cp -a $install/etc/xdg/openbox/menu.en.xml \
    1.51 +				$install/etc/xdg/openbox/menu.xml \
    1.52  				$fs/etc/xdg/openbox ;;
    1.53  		arm)
    1.54 -			cp -a rootfs/* ${fs} ;;
    1.55 +			mkdir -p $fs/usr/share
    1.56 +			cp -a $src/rootfs/usr/share/applications $fs/usr/share
    1.57 +			cp -a $src/rootfs/usr/share/slitaz $fs/usr/share ;;
    1.58  	esac
    1.59  	chown -R root.root $fs
    1.60  }