diff --git a/network/jitsi/jitsi.SlackBuild b/network/jitsi/jitsi.SlackBuild index dea951b97a..636e19af35 100644 --- a/network/jitsi/jitsi.SlackBuild +++ b/network/jitsi/jitsi.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=jitsi -VERSION=${VERSION:-2.8} +VERSION=${VERSION:-5633} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,8 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-src-$VERSION.5426.zip -mv $PRGNAM $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -70,8 +69,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed -i "s/0.build.by.SVN/5426/g" src/net/java/sip/communicator/impl/version/NightlyBuildID.java - ant rebuild mkdir -p $PKG/usr/bin @@ -86,9 +83,9 @@ mkdir -p $PKG/usr/share/jitsi/lib/native cp resources/install/resources/splash.gif $PKG/usr/share/jitsi cp lib/{felix.client.run.properties,felix.jar,jitsi-defaults.properties,logging.properties} $PKG/usr/share/jitsi/lib if [ "$ARCH" = "x86_64" ]; then - cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native + cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native else - cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native + cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native fi cp lib/bundle/{commons-logging.jar,log4j.jar} $PKG/usr/share/jitsi/lib/bundle @@ -113,7 +110,6 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -sed 's#_PACKAGE_NAME_#jitsi#' resources/install/debian/changelog.tmpl | sed 's#_VERSION_#2.8.5426-1#' | sed 's#_DATE_#Thu, 19 Mar 2015 02:20:44 -0400#' > $PKG/usr/doc/$PRGNAM-$VERSION/changelog cp resources/install/debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/jitsi/jitsi.info b/network/jitsi/jitsi.info index 8d2c254e97..bb50a7a694 100644 --- a/network/jitsi/jitsi.info +++ b/network/jitsi/jitsi.info @@ -1,10 +1,10 @@ PRGNAM="jitsi" -VERSION="2.8" +VERSION="5633" HOMEPAGE="https://jitsi.org/" -DOWNLOAD="https://download.jitsi.org/jitsi/src/jitsi-src-2.8.5426.zip" -MD5SUM="db86aa3c754e54e774257c09e7c474d2" +DOWNLOAD="https://github.com/jitsi/jitsi/archive/5633/jitsi-5633.tar.gz" +MD5SUM="0844dc46176c7940cdeac075559d38e6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="openjdk7" +REQUIRES="apache-ant jdk" MAINTAINER="Furry Monster" EMAIL="furrymonster at gmx dot com"