Updates building rpm packages. Fixes startup script.

resources/install/rpm/SPECS/build-jitsi-rpm.sh

@@ -1,17 +1,15 @@
-#!/bin/bash -x
+#!/bin/bash -xe
 
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+cd $SCRIPT_DIR
 #exec > "${0%.*}.log" 2>&1
 
-#exec -x
-
-if [[ "$1" == "--help" || "$1" == "-h" || "$1" == "-?" || $# -lt 2 ]]; then
-    echo "Usage $0 VERSION BUILD_NUMBER"
+if [[ "$1" == "--help" || "$1" == "-h" || "$1" == "-?" || $# -lt 1 ]]; then
+    echo "Usage $0 BUILD_NUMBER"
     exit 1
 fi
 
-version=$1
-buildNumber=$2
+buildNumber=$1
 
 # Deletes everything but the newest files matching the specified pattern
 clean_oldies() {
@@ -26,13 +24,18 @@ clean_oldies() {
     ls -t $pattern | tail -$tailCount | xargs rm -f
 }
 
-cd $SCRIPT_DIR/SOURCES
+cd SOURCES
+
+[[ ! -d jitsi ]] && git clone https://github.com/jitsi/jitsi.git
 
-[[ ! -d jitsi ]] && git clone https://github.com/jitsi/jitsi
 cd jitsi
 git stash
 git pull --rebase
-git stash pop
+git stash pop || true
+
+VERSION_MAJOR=$(grep 'public static final int VERSION_MAJOR = ' src/net/java/sip/communicator/impl/version/VersionImpl.java | awk '{print $7}' | awk -F ';' '{print $1}')
+VERSION_MINOR=$(grep 'public static final int VERSION_MINOR = ' src/net/java/sip/communicator/impl/version/VersionImpl.java | awk '{print $7}' | awk -F ';' '{print $1}')
+version=$VERSION_MAJOR.$VERSION_MINOR
 
 echo "Creating zip file"
 cd $SCRIPT_DIR/SOURCES

resources/install/rpm/SPECS/jitsi.spec

@@ -1,19 +1,21 @@
 Name:     jitsi
-Version:  2.3
-Release:  4831
+Version:  2.5
+Release:  5267
 Summary:  Jitsi - Open Source Video Calls and Chat
-Packager: Pavel Tankov <ptankov@bluejimp.com>
+Packager: Damian Minkov <damencho@jitsi.org>
 
 Group:     Applications/Internet
 License:   GNU Lesser General Public License
 URL:       https://www.jitsi.org
-Source0:   http://download.jitsi.org/jitsi/nightly/src/jitsi-src-2.3-4831.zip
+Source0:   http://download.jitsi.org/jitsi/nightly/src/%{name}-src-%{version}-%{release}.zip
 BuildRoot: %{_topdir}/buildroot
 
 AutoReqProv:   no
 BuildRequires: java-devel >= 0:1.6
 BuildRequires: ant
+BuildRequires: ant-nodeps
 BuildRequires: gzip
+BuildRequires:  git-core
 
 Requires: java >= 0:1.6
 
@@ -28,7 +30,7 @@ Yahoo! and many other useful features.
 %setup -q -n jitsi
 
 %build
-ant -Dlabel=4831 rebuild
+ant -Dlabel=%{release} rebuild
 
 %install
 [ "$(readlink -f "$RPM_BUILD_ROOT")" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -56,6 +58,7 @@ gzip $RPM_BUILD_ROOT/usr/share/man/man1/jitsi.1
 # copy the launcher script
 cp resources/install/debian/jitsi.sh.tmpl $RPM_BUILD_ROOT/usr/bin/jitsi
 sed -i -e "s/_PACKAGE_NAME_/jitsi/" $RPM_BUILD_ROOT/usr/bin/jitsi
+sed -i -e "s/-common/\/sc-bundles/" $RPM_BUILD_ROOT/usr/bin/jitsi
 
 # 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
@@ -125,6 +128,10 @@ sed -i -e "s/\/launchutils.jar//" $RPM_BUILD_ROOT/usr/bin/jitsi
 %doc %{_mandir}/man*/*
 
 %changelog
+* Tue Jul 29 2014 poma <poma@gmail.com>
+- Repair jitsi.spec in regard to jitsi.sh.tmpl commit 4064c28,
+  and build-jitsi-rpm.sh for the build on Fedora.
+
 * Fri Sep 13 2013 Pavel Tankov <ptankov@bluejimp.com>
 - Now depends on java >= 0:1.6.
 - Changed the info to conform with the description on the website.