From e20e7d30240310cd66bb99acac7d81127a2dee33 Mon Sep 17 00:00:00 2001 From: Mauro Giachero Date: Tue, 11 May 2010 22:25:41 +0200 Subject: network/skype: Updated for version 2.0.0.72 --- network/skype/README | 20 +------------ network/skype/doinst.sh | 9 ++++-- network/skype/skype.SlackBuild | 67 ++++++++++++------------------------------ network/skype/skype.info | 12 ++++---- 4 files changed, 33 insertions(+), 75 deletions(-) diff --git a/network/skype/README b/network/skype/README index 750832cb9a..71d327e0b5 100644 --- a/network/skype/README +++ b/network/skype/README @@ -1,25 +1,7 @@ -Skype is a P2P Voice Over IP program. - Skype is a free Voice Over IP program for Linux, Windows and MacOS. It allows users to communicate with other Skype users running any of the supported platforms, as well as receiving and placing calls from and to normal land lines as well as mobile phones. -This SlackBuild allows to build both 1.3 and 1.4 versions of -Skype. - -Skype 1.3 needs QT3, so you'll have that installed (QT3 is -part of the slackware distribution). -Skype 1.4 needs libsigcxx (libsigc++), available on both -SlackBuilds.org and linuxpackages.net). - -Since Skype 1.4 is QT4-based, to keep dependencies at a -minimum the linked file is a static build, and is twice as -large as the 1.3 version, which is instead a dinamically -built QT3-based package. -The Skype 1.3 mirror is -http://ftp.surfnet.nl/pub/os/Linux/distr/pardusrepo/sources/skype-1.3.0.53-generic.tar.bz2 -md5sum: e288e398e4a34a5760ff6321b253ed08 - -Both versions work fine with Slamd64. \ No newline at end of file +This script repackages the static tarball provided by Skype. diff --git a/network/skype/doinst.sh b/network/skype/doinst.sh index 9c8ab7d00f..0b412635df 100644 --- a/network/skype/doinst.sh +++ b/network/skype/doinst.sh @@ -2,11 +2,11 @@ config() { NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" + OLD="$(dirname $NEW)/$(basename $NEW .new)" # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy rm $NEW fi @@ -14,3 +14,8 @@ config() { } config etc/dbus-1/system.d/skype.conf.new + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications +fi + diff --git a/network/skype/skype.SlackBuild b/network/skype/skype.SlackBuild index 18b3193efd..ca54afb7d8 100644 --- a/network/skype/skype.SlackBuild +++ b/network/skype/skype.SlackBuild @@ -23,17 +23,16 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Modified by the SlackBuilds.org project -# Added Skype 1.4 compatibility by Mauro Giachero - -set -e +# Modified by the SlackBuilds.org project +# Ported from 12.1 repository; now only Skype 2.0 compatible PRGNAM=skype -VERSION=1.4.0.118 -ARCH=${ARCH:-i486} +VERSION=2.0.0.72 +ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -CWD=`pwd` + +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -41,56 +40,28 @@ OUTPUT=${OUTPUT:-/tmp} # This is a repackage of a binary distribution # CFLAGS are not required +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 rm -rf $PRGNAM-$VERSION -# 1.3.x.y packages are named "skype-1.3.x.y-generic.tar.bz2" -# 1.4.x.y packages are named "skype_static-1.4.x.y.tar.bz2" -# Since the _static package is twice as large as the -generic -# one, we keep this script compatible with both. -# The $SOURCETYPE variable is used in later steps to filter -# 1.3-only and 1.4-only things -if [ -f $CWD/$PRGNAM-$VERSION-generic.tar.bz2 ]; then - echo Unpacking $PRGNAM-$VERSION-generic.tar.bz2 - tar -xjvf $CWD/$PRGNAM-$VERSION-generic.tar.bz2 || exit 1 - cd $PRGNAM-$VERSION || exit 1 - SOURCETYPE=1.3 -else - echo Unpacking ${PRGNAM}_static-$VERSION.tar.bz2 - tar -xjvf $CWD/${PRGNAM}_static-$VERSION.tar.bz2 || exit 1 - cd ${PRGNAM}_static-$VERSION || exit 1 - SOURCETYPE=1.4 -fi - +tar xvf $CWD/${PRGNAM}_static-$VERSION.tar.bz2 || exit 1 +cd ${PRGNAM}_static-$VERSION || exit 1 chown -R root:root . chmod -R u+w,go+r-w,a-s . -if [ $SOURCETYPE == 1.3 ]; then - chmod 644 sound/* -else - chmod 644 sounds/* -fi +chmod 644 sounds/* -# ./configure not necessary for binary based builds -mkdir -p $PKG/{usr/{bin,share/{skype,pixmaps,applications}},etc/dbus-1/system.d} -cp skype $PKG/usr/bin -if [ $SOURCETYPE == 1.3 ]; then - cp -R sound lang $PKG/usr/share/skype - cp icons/skype_48_32.png $PKG/usr/share/pixmaps/skype.png - cp skype-callto-handler $PKG/usr/bin -else - cp -R sounds lang $PKG/usr/share/skype - cp icons/SkypeBlue_48x48.png $PKG/usr/share/pixmaps/skype.png - cp -R avatars $PKG/usr/share/skype -fi +mkdir -p $PKG/usr/bin $PKG/usr/share/{skype,pixmaps,applications} \ + $PKG/etc/dbus-1/system.d +cp -a skype $PKG/usr/bin +cp -a avatars sounds lang $PKG/usr/share/skype +cp skype.desktop $PKG/usr/share/applications/skype.desktop +cp icons/SkypeBlue_48x48.png $PKG/usr/share/pixmaps/skype.png cp skype.conf $PKG/etc/dbus-1/system.d/skype.conf.new -sed -e "s/Icon\=skype.png/Icon\=\/usr\/share\/pixmaps\/skype.png/g" \ - skype.desktop > $PKG/usr/share/applications/skype.desktop -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/network/skype/skype.info b/network/skype/skype.info index a70150bd6f..c9acc0d7fd 100644 --- a/network/skype/skype.info +++ b/network/skype/skype.info @@ -1,8 +1,8 @@ PRGNAM="skype" -VERSION="1.4.0.118" +VERSION="2.0.0.72" HOMEPAGE="http://www.skype.com" -DOWNLOAD="http://download.skype.com/linux/skype_static-1.4.0.118.tar.bz2" -MD5SUM="95d44d423ec7566b48af47007c7a02c6" -MAINTAINER="Martin Lefebvre" -EMAIL="dadexter@gmail.com" -APPROVED="Erik Hanson" +DOWNLOAD="http://download.skype.com/linux/skype_static-2.0.0.72.tar.bz2" +MD5SUM="cfaa796ef55e3f858a09bbe096eded5a" +MAINTAINER="Mauro Giachero" +EMAIL="mauro dot giachero at gmail dot com" +APPROVED="rworkman" -- cgit v1.2.3