On 28.07.2014 16:06, Damian Minkov wrote:
Hi,
Thanks for the report I will take a look this days, when time permits.
This change was introduced for debian source package, strange it
reflected the rpm one.
Thanks
damencho
Here it is.
Repair jitsi.spec in regard to jitsi.sh.tmpl commit 4064c28,
and build-jitsi-rpm.sh for the build on Fedora.
---
resources/install/rpm/SPECS/build-jitsi-rpm.sh | 27 ++++++++++++++------------
resources/install/rpm/SPECS/jitsi.spec | 13 +++++++++----
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/resources/install/rpm/SPECS/build-jitsi-rpm.sh b/resources/install/rpm/SPECS/build-jitsi-rpm.sh
index 932df3d..388ed96 100755
--- a/resources/install/rpm/SPECS/build-jitsi-rpm.sh
+++ b/resources/install/rpm/SPECS/build-jitsi-rpm.sh
@@ -1,6 +1,9 @@
#!/bin/bash -x
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+SPECS_DIR="$(dirname $SCRIPT_DIR)/SPECS"
+SOURCES_DIR="$(dirname $SCRIPT_DIR)/SOURCES"
+RPMS_DIR="$(dirname $SCRIPT_DIR)/RPMS"
#exec > "${0%.*}.log" 2>&1
#exec -x
@@ -26,7 +29,7 @@ clean_oldies() {
ls -t $pattern | tail -$tailCount | xargs rm -f
}
-cd $SCRIPT_DIR/SOURCES
+cd $SOURCES_DIR
[[ ! -d jitsi ]] && git clone https://github.com/jitsi/jitsi
cd jitsi
@@ -35,7 +38,7 @@ git pull --rebase
git stash pop
echo "Creating zip file"
-cd $SCRIPT_DIR/SOURCES
+cd $SOURCES_DIR
rm -f jitsi-src*.zip
zipFileName=jitsi-src-${version}-${buildNumber/./-}.zip
zip -rq $zipFileName jitsi -x 'jitsi/.git/* jitsi/.gitignore'
@@ -45,24 +48,24 @@ sed -i \
-e "s@Release:\( *\).*@Release:\1$buildNumber@" \
-e "s@Source0:\( *\).*@Source0:\1http://download.jitsi.org/jitsi/nightly/src/$zipFileName@" \
-e "s@ant -Dlabel=.* rebuild@ant -Dlabel=$buildNumber rebuild@" \
-$SCRIPT_DIR/SPECS/jitsi.spec
+$SPECS_DIR/jitsi.spec
-rm -f $SCRIPT_DIR/RPMS/i686/jitsi*.rpm
+rm -f $RPMS_DIR/i686/jitsi*.rpm
echo "=============[ Building i686 RPM package ]============="
# Note! rpmbuild --target is known not to work correctly, so we use setarch
-setarch i686 rpmbuild -bb $SCRIPT_DIR/SPECS/jitsi.spec
+setarch i686 rpmbuild -bb $SPECS_DIR/jitsi.spec
packagename32=jitsi-${version}-${buildNumber}.i686.rpm
-rm -f $SCRIPT_DIR/RPMS/x86_64/jitsi*.rpm
+rm -f $RPMS_DIR/x86_64/jitsi*.rpm
echo "=============[ Building x86_64 RPM package ]============="
# Note! rpmbuild --target is known not to work correctly, so we use setarch
-setarch x86_64 rpmbuild -bb $SCRIPT_DIR/SPECS/jitsi.spec
+setarch x86_64 rpmbuild -bb $SPECS_DIR/jitsi.spec
packagename64=jitsi-${version}-${buildNumber}.x86_64.rpm
-mkdir -p $SCRIPT_DIR/RPMS/common
+mkdir -p $RPMS_DIR/common
-cp $SCRIPT_DIR/RPMS/i686/$packagename32 $SCRIPT_DIR/RPMS/common/
-cp $SCRIPT_DIR/RPMS/x86_64/$packagename64 $SCRIPT_DIR/RPMS/common/
-clean_oldies "$SCRIPT_DIR/RPMS/common/jitsi*.rpm" 20
+cp $RPMS_DIR/i686/$packagename32 $RPMS_DIR/common/
+cp $RPMS_DIR/x86_64/$packagename64 $RPMS_DIR/common/
+clean_oldies "$RPMS_DIR/common/jitsi*.rpm" 20
-createrepo --database --deltas $SCRIPT_DIR/RPMS/common/
+createrepo --database --deltas $RPMS_DIR/common/
diff --git a/resources/install/rpm/SPECS/jitsi.spec b/resources/install/rpm/SPECS/jitsi.spec
index a106e84..752105f 100644
--- a/resources/install/rpm/SPECS/jitsi.spec
+++ b/resources/install/rpm/SPECS/jitsi.spec
@@ -1,13 +1,13 @@
Name: jitsi
-Version: 2.3
-Release: 4831
+Version: 2.5
+Release: 5264
Summary: Jitsi - Open Source Video Calls and Chat
Packager: Pavel Tankov <ptankov@bluejimp.com>
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
@@ -28,7 +28,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 +56,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 +126,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.
--
1.9.3
poma
_______________________________________________
dev mailing list
dev@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/dev
