1 files changed, 11 insertions, 7 deletions
diff --git a/network/jitsi/jitsi.SlackBuild b/network/jitsi/jitsi.SlackBuild
index cd9d1d2d9d..596747b058 100644
--- a/network/jitsi/jitsi.SlackBuild
+++ b/network/jitsi/jitsi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for jitsi
 
-# Copyright 2014 Furry Monster <furrymonster at gmx dot com>
+# Copyright 2015 Furry Monster <furrymonster at gmx dot com>
 # 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=jitsi
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-src-$VERSION.4997.zip
+unzip $CWD/$PRGNAM-src-$VERSION.5390.zip
 mv $PRGNAM $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -68,14 +68,14 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-sed -i "s/0.build.by.SVN/4997/g" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
+sed -i "s/0.build.by.SVN/5390/g" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
 
 ant rebuild
 
 mkdir -p $PKG/usr/bin
-sed 's/_PACKAGE_NAME_/jitsi/g' resources/install/debian/jitsi.sh.tmpl | sed 's#^CLASSPATH=.*$#CLASSPATH=$LIBPATH/felix.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar:$LIBPATH#' | sed 's#/usr/lib/jni#$LIBPATH/native#' > $PKG/usr/bin/jitsi
+sed 's/_PACKAGE_NAME_/jitsi/g' resources/install/debian/jitsi.sh.tmpl | sed 's#-common#/sc-bundles#' | sed 's#^CLASSPATH=.*$#CLASSPATH=$LIBPATH/felix.jar:$SCDIR/sc-bundles/sc-launcher.jar:$JITSI_COMMON_DIR/util.jar:$LIBPATH#' | sed 's#/usr/lib/jni#$SCDIR/lib/native#' | sed 's#$SPLASH_ARG#$SPLASH_ARG -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=.jitsi#' > $PKG/usr/bin/jitsi
 chmod +x $PKG/usr/bin/jitsi
 
 mkdir -p $PKG/usr/share/applications
@@ -83,18 +83,20 @@ sed 's/_PACKAGE_NAME_/jitsi/g' resources/install/debian/jitsi.desktop.tmpl | sed
 
 mkdir -p $PKG/usr/share/jitsi/lib/bundle
 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
 else
 	cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native
 fi
-cp lib/bundle/{commons-logging.jar,log4j.jar,org.apache.felix.bundlerepository-1.6.4.jar} $PKG/usr/share/jitsi/lib/bundle
+cp lib/bundle/{commons-logging.jar,log4j.jar} $PKG/usr/share/jitsi/lib/bundle
 
 mkdir -p $PKG/usr/share/jitsi/sc-bundles
 cp sc-bundles/* $PKG/usr/share/jitsi/sc-bundles || echo
 cp sc-bundles/os-specific/linux/* $PKG/usr/share/jitsi/sc-bundles
 rm $PKG/usr/share/jitsi/sc-bundles/*-slick.jar
+rm $PKG/usr/share/jitsi/sc-bundles/slick*.jar
 
 mkdir -p $PKG/usr/man/man1
 sed 's/_PACKAGE_NAME_/jitsi/g' resources/install/debian/jitsi.1.tmpl | sed 's/_APP_NAME_/Jitsi/g' > $PKG/usr/man/man1/jitsi.1
@@ -111,6 +113,8 @@ 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.6.5390-1#' | sed 's#_DATE_#Tue, 27 Jan 2015 13:46:30 -0500#' > $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
 
 mkdir -p $PKG/install