From bc7e46445e519f713293b592d52cfa99b37eb60c Mon Sep 17 00:00:00 2001 From: Sergey Zhemoitel Date: Tue, 21 May 2013 13:27:13 +0400 Subject: [PATCH] Update to 2.0 --- .abf.yml | 3 +- jitsi.spec | 210 ++++++++++++++++++++++++------------------------- jitsi.spec.old | 125 +++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+), 106 deletions(-) create mode 100644 jitsi.spec.old diff --git a/.abf.yml b/.abf.yml index 794ab29..7f3a480 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: - "jitsi-src-1.0-latest.zip": b21166e30103bd0440ac722cbb53bdcdc7c179d7 + jitsi-src-1.0-latest.zip: b21166e30103bd0440ac722cbb53bdcdc7c179d7 + jitsi-src-2.0-latest.zip: 3726f1db2d2d5c989de2d2e2aac6c77289a2840c diff --git a/jitsi.spec b/jitsi.spec index ca997c6..9e59700 100644 --- a/jitsi.spec +++ b/jitsi.spec @@ -1,125 +1,125 @@ -#define revision 3967 -Name: jitsi -Version: 1.0 -Release: %mkrel 1 -Summary: Jitsi is an audio/video Internet phone and instant messenger written in Java. -License: LGPL -Group: Graphics -URL: http://jitsi.org/ -Source0: %{name}-src-%{version}-latest.zip -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ant, java-devel, ant-nodeps -Requires: java >= 1.6-sun +Name: jitsi +Version: 2.0 +Release: 2 +Summary: Jitsi - Open Source Video Calls and Chat +#Packager: Damian Minkov + +Group: Communications +License: GNU Lesser General Public License +URL: https://www.jitsi.org +#Source0: http://download.jitsi.org/jitsi/nightly/src/jitsi-src-1.1-4467-10442.zip +Source: http://download.jitsi.org/jitsi/nightly/src/%{name}-src-%{version}-latest.zip +BuildRoot: %{_topdir}/buildroot + +AutoReqProv: no +BuildRequires: java-devel +BuildRequires: ant +BuildRequires: ant-nodeps +BuildRequires: gzip +BuildRequires: subversion + +Requires: java %description -Jitsi is an audio/video Internet phone and instant messenger written in Java. -It supports some of the most popular instant messaging and telephony protocols -such as SIP, Jabber/XMPP (and hence Facebook and Google Talk), AIM, ICQ, MSN, -Yahoo! Messenger, IRC, Bonjour and soon others like IAX. +Jitsi is an audio/video Internet phone and instant messenger that +supports some of the most popular instant messaging and telephony protocols +such as SIP, Jabber, AIM/ICQ, MSN, Yahoo! Messenger, Bonjour, RSS and +counting. Jitsi is completely Open Source / Free Software, and is +freely available under the terms of the GNU Lesser General Public License. - -%prep - -%setup -q -n %{name} +%prep +%setup -q -n jitsi %build -ant rebuild +#ant -Dlabel=4467.10442 rebuild +ant -Dlabel=4506.10553 rebuild %install -rm -rf $RPM_BUILD_ROOT +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -%__install -d -m 755 %{buildroot}%{_javadir}/%{name} -#%__install -m 755 %{name}-%{version}.jar %{buildroot}%{_javadir}/sip-communicator/ +mkdir -p $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/usr/share +mkdir -p $RPM_BUILD_ROOT/usr/share/applications +mkdir -p $RPM_BUILD_ROOT/usr/share/doc/jitsi +mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 +mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps +mkdir -p $RPM_BUILD_ROOT/usr/share/jitsi +mkdir -p $RPM_BUILD_ROOT/usr/share/jitsi/lib +mkdir -p $RPM_BUILD_ROOT/usr/share/jitsi/lib/bundle +mkdir -p $RPM_BUILD_ROOT/usr/share/jitsi/lib/native +mkdir -p $RPM_BUILD_ROOT/usr/share/jitsi/sc-bundles -%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/sc-bundles -%__install -m 755 sc-bundles/*.jar %{buildroot}%{_javadir}/%{name}/sc-bundles/ +# copy the documentation +cp resources/install/debian/jitsi.1.tmpl $RPM_BUILD_ROOT/usr/share/man/man1/jitsi.1 +sed -i -e "s/_PACKAGE_NAME_/jitsi/" $RPM_BUILD_ROOT/usr/share/man/man1/jitsi.1 +sed -i -e "s/_APP_NAME_/Jitsi/" $RPM_BUILD_ROOT/usr/share/man/man1/jitsi.1 +gzip $RPM_BUILD_ROOT/usr/share/man/man1/jitsi.1 -%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/sc-bundles/os-specific -%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/sc-bundles/os-specific/linux -%__install -m 755 sc-bundles/os-specific/linux/*.jar %{buildroot}%{_javadir}/%{name}/sc-bundles/os-specific/linux/ +# 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 -%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/lib -%__install -m 755 lib/*.jar %{buildroot}%{_javadir}/%{name}/lib/ -%__install -m 755 lib/*.properties %{buildroot}%{_javadir}/%{name}/lib/ +# 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 +chmod a+x $RPM_BUILD_ROOT/usr/bin/jitsi -%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/lib/os-specific/linux -%__install -m 755 lib/os-specific/linux/*.jar %{buildroot}%{_javadir}/%{name}/lib/os-specific/linux/ +# copy the menu icons +cp resources/install/debian/jitsi-32.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/jitsi-32.xpm +cp resources/install/debian/jitsi-16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/jitsi-16.xpm +cp resources/install/debian/jitsi.svg $RPM_BUILD_ROOT/usr/share/pixmaps/jitsi.svg -## arch dependend libs -%__install -d -m 755 %{buildroot}%{_libdir} -%ifarch x86_64 -#%__install -d -m 755 %{buildroot}%{_javadir}/sip-communicator/lib/native/linux -#%__install -m 755 lib/native/linux/* %{buildroot}%{_javadir}/sip-communicator/lib/native/linux/ -%__install -m 755 lib/native/linux-64/* %{buildroot}%{_libdir}/ -%else -#%__install -d -m 755 %{buildroot}%{_javadir}/sip-communicator/lib/native/linux -%__install -m 755 lib/native/linux/* %{buildroot}%{_libdir}/ -#%__install -m 755 lib/native/linux/* %{buildroot}%{_javadir}/sip-communicator/lib/native/linux/ +# copy the menu entry +cp resources/install/debian/jitsi.desktop.tmpl $RPM_BUILD_ROOT/usr/share/applications/jitsi.desktop +sed -i -e "s/_PACKAGE_NAME_/jitsi/" $RPM_BUILD_ROOT/usr/share/applications/jitsi.desktop +sed -i -e "s/_APP_NAME_/Jitsi/" $RPM_BUILD_ROOT/usr/share/applications/jitsi.desktop + +# copy the sc-bundles +cp sc-bundles/*.jar $RPM_BUILD_ROOT/usr/share/jitsi/sc-bundles/ +# remove all slicks +rm -rf $RPM_BUILD_ROOT/usr/share/jitsi/sc-bundles/*-slick.jar +rm -rf $RPM_BUILD_ROOT/usr/share/jitsi/sc-bundles/slick*.jar + +# copy the os-specific sc-bundles +cp sc-bundles/os-specific/linux/*.jar $RPM_BUILD_ROOT/usr/share/jitsi/sc-bundles/ + +# copy the lib jars +cp lib/*.jar $RPM_BUILD_ROOT/usr/share/jitsi/lib/ +cp lib/bundle/* $RPM_BUILD_ROOT/usr/share/jitsi/lib/bundle/ +rm $RPM_BUILD_ROOT/usr/share/jitsi/lib/bundle/junit.jar +cp lib/os-specific/linux/*.jar $RPM_BUILD_ROOT/usr/share/jitsi/lib/ + +# copy the native libs +%ifarch i386 i586 i686 +cp lib/native/linux/* $RPM_BUILD_ROOT/usr/share/jitsi/lib/native/ +%else +cp lib/native/linux-64/* $RPM_BUILD_ROOT/usr/share/jitsi/lib/native/ %endif +# copy the resources +cp resources/install/logging.properties $RPM_BUILD_ROOT/usr/share/jitsi/lib/ +cp lib/felix.client.run.properties $RPM_BUILD_ROOT/usr/share/jitsi/lib/ -# menu-entry -mkdir -p %{buildroot}%{_datadir}/applications -cat > %{buildroot}%{_datadir}/applications/%{name}.desktop < %{name} << EOF -#!/bin/sh - -#java -Dfelix.config.properties=file:%{_javadir}/sip-communicator/lib/felix.client.run.properties \ -# -Djava.util.logging.config.file=%{_javadir}/sip-communicator/lib/logging.properties \ -# org.apache.felix.main.Main - -exec java -jar %{_javadir}/%{name}/%{name}-%{version}.jar - -EOF - -%__install -d -m 755 %{buildroot}%{_bindir} -%__install -m 755 %{name} %{buildroot}%{_bindir}/ - -# Icon -%__install -D -p -m 644 resources/install/linux/sc-logo.png %{buildroot}%{_datadir}/pixmaps/%{name}.png -%__install -D -p -m 644 resources/images/logo/sc_logo.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg - - -# Desktop menu entry -%__install -d -m 755 %{buildroot}%{_datadir}/applications -#%__install -m 644 resources/install/debian/sip-communicator.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop - -# docs -%__install -D -p -m 644 resources/install/doc/readme.txt README -%__install -D -p -m 644 resources/install/doc/License.txt LICENSE +# Make felix deploy its bundles in ~/.felix/sip-communicator.bin +sed -i -e "s/felix.cache.profiledir=sip-communicator.bin/felix.cache.profile=sip-communicator.bin/" $RPM_BUILD_ROOT/usr/share/jitsi/lib/felix.client.run.properties +# fix shell script +sed -i -e "s/\/usr\/lib\/jni/\$LIBPATH\/native/" $RPM_BUILD_ROOT/usr/bin/jitsi +sed -i -e "s/\/usr\/share\/java\/jdic\.jar/\$LIBPATH\/jdic_stub\.jar:\$LIBPATH\/jdic-all\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi +sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.framework\.jar/\$LIBPATH\/felix\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi +sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.main\.jar://" $RPM_BUILD_ROOT/usr/bin/jitsi +sed -i -e "s/\/launchutils.jar//" $RPM_BUILD_ROOT/usr/bin/jitsi %clean -rm -rf $RPM_BUILD_ROOT - -%post -#ln -sf /opt/%{name}/%{name} /usr/bin/sweethome - -%postun -#rm -rf /usr/bin/sweethome +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) -%{_datadir}/applications/%{name}.desktop -%defattr(-,root,root) -# %doc README LICENSE CHANGELOG -%doc README LICENSE -%{_bindir}/* -%{_libdir}/* -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/* -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/pixmaps/%{name}.svg +%defattr(-,root,root,-) +%{_bindir}/jitsi +#%{_libdir}/jitsi/ +/usr/share/jitsi +/usr/share/applications/jitsi* +/usr/share/pixmaps/jitsi* +%doc %{_mandir}/man*/* + +%changelog diff --git a/jitsi.spec.old b/jitsi.spec.old new file mode 100644 index 0000000..ca997c6 --- /dev/null +++ b/jitsi.spec.old @@ -0,0 +1,125 @@ +#define revision 3967 +Name: jitsi +Version: 1.0 +Release: %mkrel 1 +Summary: Jitsi is an audio/video Internet phone and instant messenger written in Java. +License: LGPL +Group: Graphics +URL: http://jitsi.org/ +Source0: %{name}-src-%{version}-latest.zip +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: ant, java-devel, ant-nodeps +Requires: java >= 1.6-sun + +%description +Jitsi is an audio/video Internet phone and instant messenger written in Java. +It supports some of the most popular instant messaging and telephony protocols +such as SIP, Jabber/XMPP (and hence Facebook and Google Talk), AIM, ICQ, MSN, +Yahoo! Messenger, IRC, Bonjour and soon others like IAX. + + +%prep + +%setup -q -n %{name} + +%build +ant rebuild + +%install +rm -rf $RPM_BUILD_ROOT + +%__install -d -m 755 %{buildroot}%{_javadir}/%{name} +#%__install -m 755 %{name}-%{version}.jar %{buildroot}%{_javadir}/sip-communicator/ + +%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/sc-bundles +%__install -m 755 sc-bundles/*.jar %{buildroot}%{_javadir}/%{name}/sc-bundles/ + +%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/sc-bundles/os-specific +%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/sc-bundles/os-specific/linux +%__install -m 755 sc-bundles/os-specific/linux/*.jar %{buildroot}%{_javadir}/%{name}/sc-bundles/os-specific/linux/ + +%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/lib +%__install -m 755 lib/*.jar %{buildroot}%{_javadir}/%{name}/lib/ +%__install -m 755 lib/*.properties %{buildroot}%{_javadir}/%{name}/lib/ + +%__install -d -m 755 %{buildroot}%{_javadir}/%{name}/lib/os-specific/linux +%__install -m 755 lib/os-specific/linux/*.jar %{buildroot}%{_javadir}/%{name}/lib/os-specific/linux/ + +## arch dependend libs +%__install -d -m 755 %{buildroot}%{_libdir} +%ifarch x86_64 +#%__install -d -m 755 %{buildroot}%{_javadir}/sip-communicator/lib/native/linux +#%__install -m 755 lib/native/linux/* %{buildroot}%{_javadir}/sip-communicator/lib/native/linux/ +%__install -m 755 lib/native/linux-64/* %{buildroot}%{_libdir}/ +%else +#%__install -d -m 755 %{buildroot}%{_javadir}/sip-communicator/lib/native/linux +%__install -m 755 lib/native/linux/* %{buildroot}%{_libdir}/ +#%__install -m 755 lib/native/linux/* %{buildroot}%{_javadir}/sip-communicator/lib/native/linux/ +%endif + + +# menu-entry +mkdir -p %{buildroot}%{_datadir}/applications +cat > %{buildroot}%{_datadir}/applications/%{name}.desktop < %{name} << EOF +#!/bin/sh + +#java -Dfelix.config.properties=file:%{_javadir}/sip-communicator/lib/felix.client.run.properties \ +# -Djava.util.logging.config.file=%{_javadir}/sip-communicator/lib/logging.properties \ +# org.apache.felix.main.Main + +exec java -jar %{_javadir}/%{name}/%{name}-%{version}.jar + +EOF + +%__install -d -m 755 %{buildroot}%{_bindir} +%__install -m 755 %{name} %{buildroot}%{_bindir}/ + +# Icon +%__install -D -p -m 644 resources/install/linux/sc-logo.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +%__install -D -p -m 644 resources/images/logo/sc_logo.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg + + +# Desktop menu entry +%__install -d -m 755 %{buildroot}%{_datadir}/applications +#%__install -m 644 resources/install/debian/sip-communicator.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop + +# docs +%__install -D -p -m 644 resources/install/doc/readme.txt README +%__install -D -p -m 644 resources/install/doc/License.txt LICENSE + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +#ln -sf /opt/%{name}/%{name} /usr/bin/sweethome + +%postun +#rm -rf /usr/bin/sweethome + +%files +%defattr(-,root,root) +%{_datadir}/applications/%{name}.desktop +%defattr(-,root,root) +# %doc README LICENSE CHANGELOG +%doc README LICENSE +%{_bindir}/* +%{_libdir}/* +%dir %{_javadir}/%{name} +%{_javadir}/%{name}/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/%{name}.svg