diff options
| -rw-r--r-- | network/teamviewer/teamviewer.SlackBuild | 23 | ||||
| -rw-r--r-- | network/teamviewer/teamviewer.info | 8 |
2 files changed, 16 insertions, 15 deletions
diff --git a/network/teamviewer/teamviewer.SlackBuild b/network/teamviewer/teamviewer.SlackBuild index df96512f6f..a2cb91b386 100644 --- a/network/teamviewer/teamviewer.SlackBuild +++ b/network/teamviewer/teamviewer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for teamviewer -# Copyright 2010-2011 Binh Nguyen <binhnguyen@fastmail.fm> +# Copyright 2010-2012 Binh Nguyen <binhnguyen@fastmail.fm> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=teamviewer -VERSION=${VERSION:-6.0.9258} +VERSION=${VERSION:-7.0.9360} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,9 +55,13 @@ set -eu # Get the real version REAL_VER=$(ar p teamviewer_linux${DEBARCH}.deb control.tar.gz | tar xzO ./control | grep Version | cut -d\ -f2 | cut -d- -f1) +if [ "$VERSION" != "$REAL_VER" ]; then + echo "Version of downloaded source [$REAL_VER] does not match version of SlackBuild [$VERSION]" + exit 1 +fi # We need this for later use -MAIN_VER=$(echo $REAL_VER | cut -d . -f 1) +MAIN_VER=$(echo $VERSION | cut -d . -f 1) rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -71,9 +75,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Remove upstream's version-specific executable -rm -f usr/bin/* - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -84,22 +85,22 @@ cat $PKG/opt/teamviewer/teamviewer/$MAIN_VER/desktop/teamviewer.desktop.template > $PKG/usr/share/applications/teamviewer.desktop # Create the generic executable -ln -sf /opt/teamviewer/teamviewer/$MAIN_VER/bin/teamviewer $PKG/usr/bin/teamviewer +( cd $PKG/usr/bin; ln -sf teamviewer$MAIN_VER teamviewer ) # Link icon to /usr/share/pixmaps mkdir -p $PKG/usr/share/pixmaps ln -sf /opt/teamviewer/teamviewer/$MAIN_VER/desktop/teamviewer.png $PKG/usr/share/pixmaps/teamviewer.png -mkdir -p $PKG/usr/doc/$PRGNAM-$REAL_VER +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION # Move docs to official place -mv $PKG/opt/teamviewer/teamviewer/$MAIN_VER/*.txt $PKG/usr/doc/$PRGNAM-$REAL_VER +mv $PKG/opt/teamviewer/teamviewer/$MAIN_VER/*.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$REAL_VER/$PRGNAM.SlackBuild +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$REAL_VER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/teamviewer/teamviewer.info b/network/teamviewer/teamviewer.info index 8bbe9c82d1..77772f086a 100644 --- a/network/teamviewer/teamviewer.info +++ b/network/teamviewer/teamviewer.info @@ -1,10 +1,10 @@ PRGNAM="teamviewer" -VERSION="6.0.9258" +VERSION="7.0.9360" HOMEPAGE="http://www.teamviewer.com/" DOWNLOAD="http://www.teamviewer.com/download/teamviewer_linux.deb" -MD5SUM="bb61905ace1c5001f885c5a47ef24b2d" +MD5SUM="7ccea6a656c196eacd028774e0811fe3" DOWNLOAD_x86_64="http://www.teamviewer.com/download/teamviewer_linux_x64.deb" -MD5SUM_x86_64="25db556896d7796e0f0f0868b5fc797a" +MD5SUM_x86_64="00d08807be74cc88c12d280be3720d0b" MAINTAINER="Binh Nguyen" EMAIL="binhnguyen@fastmail.fm" -APPROVED="rworkman" +APPROVED="rworkman,Niels Horn" |