diff --git a/.abf.yml b/.abf.yml index 7e6ae5e..a37ca9a 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,7 +1,8 @@ removed_sources: jitsi-src-2.2.4603.9615.zip: b4c7607b036a20904d4f4369764bee526b02c0fb + jitsi-src-2.6.5390.zip: 8cc9b15f83f4dc033e8e6508aa20ea85a5a846af sources: jitsi-src-1.0-latest.zip: b21166e30103bd0440ac722cbb53bdcdc7c179d7 jitsi-src-2.0-latest.zip: 3726f1db2d2d5c989de2d2e2aac6c77289a2840c jitsi-src-2.4-latest.zip: 9ee55e41ab32b497e0267f81070a1b0a9abb898f - jitsi-src-2.6.5390.zip: 8cc9b15f83f4dc033e8e6508aa20ea85a5a846af + jitsi-src-2.8.5426.zip: 97e2b6d964d2a6f7dc1ff87ea9335d106655f2bc diff --git a/jitsi.bak b/jitsi.bak new file mode 100644 index 0000000..d009b0d --- /dev/null +++ b/jitsi.bak @@ -0,0 +1,28 @@ +#!/bin/bash + +# Get architecture +ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/` + +# Additionnal JVM arguments +CLIENTARGS="" + +if [ $ARCH -eq 32 ] +then + CLIENTARGS="-client -Xmx256m" +fi + +javabin=`which java` + +SCDIR=/usr/share/jitsi +LIBPATH=$SCDIR/lib +CLASSPATH=$LIBPATH/felix.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar:$LIBPATH +FELIX_CONFIG=$LIBPATH/felix.client.run.properties +LOG_CONFIG=$LIBPATH/logging.properties +COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator" + +# set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's) +export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$LIBPATH/native" + +cd $SCDIR + +exec $COMMAND $* diff --git a/jitsi.desktop b/jitsi.desktop new file mode 100644 index 0000000..7d7a9ae --- /dev/null +++ b/jitsi.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Jitsi +GenericName=Jitsi +Comment=VoIP and Instant Messaging client +Keywords=chat;messaging;im;voip;video;call;conference; +Icon=/usr/share/pixmaps/jitsi.svg +Type=Application +Categories=Network;InstantMessaging;Chat;Telephony;VideoConference;Java; +Exec=jitsi %u +Terminal=false +MimeType=x-scheme-handler/sip;x-scheme-handler/tel;x-scheme-handler/callto; \ No newline at end of file diff --git a/jitsi.sh.patch b/jitsi.sh.patch new file mode 100644 index 0000000..5b6008d --- /dev/null +++ b/jitsi.sh.patch @@ -0,0 +1,48 @@ +*** /usr/bin/jitsi 2015-03-27 00:36:44.000000000 +0300 +--- /usr/bin/jitsi.bak 2015-03-27 13:24:25.529546809 +0300 +*************** +*** 11,39 **** + CLIENTARGS="-client -Xmx256m" + fi + +- show_splash=true +- for arg in "$@" ; do +- if [ "$arg" = "--splash=no" ] ; then +- show_splash=false +- elif [ "$arg" = "--splash=yes" ] ; then +- show_splash=true +- fi +- done +- +- SPLASH_ARG="" +- if $show_splash ; then +- SPLASH_ARG="-splash:splash.gif" +- fi +- + javabin=`which java` + + SCDIR=/usr/share/jitsi +- JITSI_COMMON_DIR=/usr/share/jitsi-common + LIBPATH=$SCDIR/lib +! CLASSPATH=$LIBPATH/felix.jar:$SCDIR/sc-bundles/sc-launcher.jar:$JITSI_COMMON_DIR/util.jar:$LIBPATH + FELIX_CONFIG=$LIBPATH/felix.client.run.properties + LOG_CONFIG=$LIBPATH/logging.properties +! COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG $SPLASH_ARG net.java.sip.communicator.launcher.SIPCommunicator" + + # set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's) + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$LIBPATH/native" +--- 11,24 ---- + CLIENTARGS="-client -Xmx256m" + fi + + javabin=`which java` + + SCDIR=/usr/share/jitsi + LIBPATH=$SCDIR/lib +! CLASSPATH=$LIBPATH/felix.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar:$LIBPATH + FELIX_CONFIG=$LIBPATH/felix.client.run.properties + LOG_CONFIG=$LIBPATH/logging.properties +! COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator" + + # set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's) + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$LIBPATH/native" diff --git a/jitsi.spec b/jitsi.spec index 85e1884..d934bb3 100644 --- a/jitsi.spec +++ b/jitsi.spec @@ -1,14 +1,17 @@ %define debug_package %nil -%define label 5390 +%define label 5426 Name: jitsi -Version: 2.6 +Version: 2.8 Release: 1 Summary: Jitsi - Open Source Video Calls and Chat Group: Communications License: LGPLv2+ URL: https://www.jitsi.org Source: http://download.jitsi.org/jitsi/nightly/src/%{name}-src-%{version}.%{label}.zip +Source1: %{name}.desktop +Source2: %{name}.bak +Patch1: %{name}.sh.patch BuildRoot: %{_topdir}/buildroot AutoReqProv: no BuildRequires: java-devel @@ -27,6 +30,7 @@ freely available under the terms of the GNU Lesser General Public License. %prep %setup -q -n %{name} +#patch1 %build ant -Dlabel=%{label} rebuild @@ -43,8 +47,8 @@ mkdir -p -m 0755 %{buildroot}%{_bindir} \ %{buildroot}%{_docdir}/%{name} \ %{buildroot}%{_mandir}/man1 \ %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/pixmaps \ - %{buildroot}%{_libdir}/%{name} + %{buildroot}%{_datadir}/pixmaps + # copy the documentation install -Dm0644 resources/install/debian/jitsi.1.tmpl %{buildroot}%{_mandir}/man1/jitsi.1 sed -i -e "s/_PACKAGE_NAME_/jitsi/" %{buildroot}%{_mandir}/man1/%{name}.1 @@ -52,8 +56,9 @@ sed -i -e "s/_APP_NAME_/Jitsi/" %{buildroot}%{_mandir}/man1/%{name}.1 gzip %{buildroot}%{_mandir}/man1/%{name}.1 # copy the launcher script -install -Dm0655 resources/install/debian/jitsi.sh.tmpl %{buildroot}%{_bindir}/%{name} -sed -i -e "s/_PACKAGE_NAME_/jitsi/" %{buildroot}%{_bindir}/%{name} +#install -Dm0655 resources/install/debian/jitsi.sh.tmpl %{buildroot}%{_bindir}/%{name} +#sed -i -e "s/_PACKAGE_NAME_/jitsi/" %{buildroot}%{_bindir}/%{name} +install -Dm655 %{SOURCE2} %{buildroot}%{_bindir}/%{name} # no more libaoss #sed -i -e "s@export LD_PRELOAD=/usr/lib/libaoss.so@export LD_PRELOAD=/usr/lib/libaoss.so.0@" $RPM_BUILD_ROOT/usr/bin/sip-communicator @@ -86,9 +91,9 @@ rm %{buildroot}%{_datadir}/%{name}/lib/bundle/junit.jar # copy the native libs %ifarch i386 i586 i686 -install -Dm0644 lib/native/linux/* %{buildroot}%{_libdir}/%{name}/ +install -Dm0644 lib/native/linux/* %{buildroot}%{_datadir}/%{name}/lib/native %else -install -Dm0644 lib/native/linux-64/* %{buildroot}%{_libdir}/%{name}/ +install -Dm0644 lib/native/linux-64/* %{buildroot}%{_datadir}/%{name}/lib/native %endif # copy the resources @@ -110,7 +115,7 @@ sed -i -e "s/\/launchutils.jar//" $RPM_BUILD_ROOT/usr/bin/jitsi %defattr(-,root,root,-) %doc %{_mandir}/man*/* %{_bindir}/%{name} -%{_libdir}/%{name}/*.so +#{_libdir}/%{name}/*.so %{_datadir}/%{name} %{_datadir}/applications/%{name}* %{_datadir}/pixmaps/%{name}*