From 014f0374d20bf965427fcff7aeca0536523d4cfa Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 23 Jul 2007 22:45:12 +0000 Subject: merged branches/0.6 into trunk git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@403 04377dda-e619-0410-9926-eae83683ac58 --- trunk/simplepkg.SlackBuild | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'trunk/simplepkg.SlackBuild') diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild index a9e90e8..9f5feec 100755 --- a/trunk/simplepkg.SlackBuild +++ b/trunk/simplepkg.SlackBuild @@ -6,13 +6,13 @@ PACKAGE="simplepkg" PACK_DIR="package-$PACKAGE" BUILD=${BUILD:=1rha} -VERSION="0.5pre22" +VERSION="0.6" ARCH="noarch" LIBEXEC="/usr/libexec/$PACKAGE" BINDIR="/usr/bin" BINARY_LIST="simplaret repos lspkg mkbuild" SBINDIR="/usr/sbin" -SBINARY_LIST="exec-slackbuild mkjail templatepkg jail-update jail-commit metapkg rebuildpkg createpkg exec-slackbuild" +SBINARY_LIST="mkjail templatepkg jail-update jail-commit metapkg rebuildpkg createpkg exec-slackbuild" LIB_LIST="common.sh" DOC_DIR="/usr/doc" DOC_LIST="COPYING TODO CHANGELOG README README.pt_BR README.simplaret README.simplaret.pt_BR" @@ -47,14 +47,13 @@ for file in $DOC_LIST; do cp doc/$file $PACK_DIR/$DOC_DIR/$PACKAGE-$VERSION/ done -mkdir -p $PACK_DIR/etc/$PACKAGE/{defaults,templates} +mkdir -p $PACK_DIR/etc/$PACKAGE/{defaults/mkbuild,templates} rsync -av --exclude=.svn templates/* $PACK_DIR/etc/$PACKAGE/defaults/templates/ chmod +x $PACK_DIR/etc/$PACKAGE/defaults/templates/vserver/vserver.s/*.sh chmod +x $PACK_DIR/etc/$PACKAGE/defaults/templates/vserver-legacy/vserver-legacy.s/*.sh -cp conf/simplepkg.conf.new $PACK_DIR/etc/$PACKAGE -cp conf/repos.conf.new $PACK_DIR/etc/$PACKAGE -cp conf/generic.mkSlackBuild.new $PACK_DIR/etc/$PACKAGE -cp utils/exec-slackbuild $PACK_DIR/$SBINDIR/ +cp conf/simplepkg.conf.new $PACK_DIR/etc/$PACKAGE/ +cp conf/repos.conf.new $PACK_DIR/etc/$PACKAGE/ +cp mkbuild/generic.mkSlackBuild.new $PACK_DIR/etc/$PACKAGE/defaults/mkbuild/ if [ -f "$PACK_DIR/usr/sbin/jail-upgrade" ]; then cd $PACK_DIR/usr/sbin && ln -s jail-upgrade vserver-upgrade -- cgit v1.2.3