diff options
| author |   Eric Hameleers <alien@slackware.com> | 2008-07-27 21:17:31 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2008-07-27 21:17:31 +0000 |
| commit | 2dd7da78b1cabc35a8986b2a4650d12312983540 (patch) | |
| tree | e09d70e3e50d9cbd7cb05e51f3141454efe9d6ab /wicd | |
| parent | d73a94b24c1a7d923cda13c9fdbf5d8d21b3e3b5 (diff) | |
| download | asb-2dd7da78b1cabc35a8986b2a4650d12312983540.tar.gz asb-2dd7da78b1cabc35a8986b2a4650d12312983540.tar.xz | |
Updated for SVN release 362
Diffstat (limited to 'wicd')
| -rwxr-xr-x | wicd/build/wicd.SlackBuild | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/wicd/build/wicd.SlackBuild b/wicd/build/wicd.SlackBuild index 2006f33c..b8bb4e62 100755 --- a/wicd/build/wicd.SlackBuild +++ b/wicd/build/wicd.SlackBuild @@ -34,6 +34,8 @@ # * Initial build. # r325-1: 03/jul/2008 by Eric Hameleers <alien@slackware.com> # * The SVN version has important fixes +# r362-1: 27/jul/2008 by Eric Hameleers <alien@slackware.com> +# * Lots of fixes again in SVN # # Run 'sh wicd.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -44,7 +46,7 @@ # Set initial variables: PRGNAM=wicd -VERSION=${VERSION:-"r325"} # SVN snapshot or official release +VERSION=${VERSION:-"r362"} # SVN snapshot or official release BRANCH=${BRANCH:-"testing-1.5.0"} # SVN 'testing' branch is where it happens ARCH=noarch BUILD=${BUILD:-1} @@ -70,8 +72,16 @@ SRCURL="" # This function checks out sources from SVN/CVS and creates a tarball of them. src_checkout() { # Param #1 : full path to where SOURCE tarball should be created. + local SVNURL=http://wicd.svn.sourceforge.net/svnroot/wicd/${BRANCH} if [ "$(echo ${VERSION}|cut -c1)" == 'r' ]; then # revision instead of date REV=$(echo ${VERSION} | cut -c2-) + elif [ "$VERSION" == "latest" -o "$VERSION" == "head" ]; then + REV=$(svn info -r HEAD ${SVNURL} | grep "^Revision: " | cut -f2 -d' ') + echo "##" + echo "## Changing VERSION from '$VERSION'..." + VERSION="r${REV}" + echo "## to '$VERSION' !" + echo "##" else REV="{${VERSION}}" fi @@ -85,7 +95,7 @@ src_checkout() { fi mkdir $PRGNAM-${VERSION} \ && cd $PRGNAM-${VERSION} \ - && svn checkout --revision $REV https://wicd.svn.sourceforge.net/svnroot/wicd/${BRANCH} . \ + && svn checkout --revision $REV ${SVNURL} . \ && find . -type d -name '.svn' -depth | xargs rm -rf \ && chown -R root:root . \ && cd .. \ @@ -158,10 +168,10 @@ chmod -R u+w,go+r-w,a-s . echo Building ... # Fix missing icons in the GUI: -cat $SRCDIR/wicd_icons.patch | patch -p1 \ - 2>&1 | tee $OUTPUT/patch-$PRGNAM.log -# Fix the version hardcoding in the setup script: -sed -i -e "/\/etc\/slackware-version/,/elif os.access/s#/usr/doc/wicd-1.5.0/#/usr/doc/$PRGNAM-$VERSION/#" setup.py +#cat $SRCDIR/wicd_icons.patch | patch -p1 \ +# 2>&1 | tee $OUTPUT/patch-$PRGNAM.log +# Fix the version in the setup script in case we use a SVN snapshot: +sed -i -e "/\/etc\/slackware-version/,/elif os.access/s#/usr/doc/wicd-%s.*#/usr/doc/$PRGNAM-$VERSION'#" setup.py # Use our own Slackware rc script, overwriting what is in the source: cat $SRCDIR/rc.wicd > init/slackware/rc.wicd # Only needed to get updated translations: |