diff --git a/.abf.yml b/.abf.yml index 15c765a..2e4576a 100644 --- a/.abf.yml +++ b/.abf.yml @@ -4,3 +4,4 @@ sources: jitsi-src-1.0-latest.zip: b21166e30103bd0440ac722cbb53bdcdc7c179d7 jitsi-src-2.0-latest.zip: 3726f1db2d2d5c989de2d2e2aac6c77289a2840c jitsi-src-2.2.4603.9615.zip: b4c7607b036a20904d4f4369764bee526b02c0fb + jitsi-src-2.4-latest.zip: 9ee55e41ab32b497e0267f81070a1b0a9abb898f diff --git a/jitsi.spec b/jitsi.spec index bc6544f..7d83a5c 100644 --- a/jitsi.spec +++ b/jitsi.spec @@ -1,14 +1,14 @@ %define debug_package %nil -%define label 4603.9615 +%define label latest Name: jitsi -Version: 2.2 -Release: 3 +Version: 2.4 +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 +Source: http://download.jitsi.org/jitsi/nightly/src/%{name}-src-%{version}-%{label}.zip BuildRoot: %{_topdir}/buildroot AutoReqProv: no BuildRequires: java-devel @@ -26,10 +26,10 @@ 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}-src-%{version}.%{label} +%setup -q -n %{name} %build -ant -Dlabel=%{label} rebuild +ant rebuild %install @@ -82,7 +82,7 @@ install -Dm0644 sc-bundles/os-specific/linux/*.jar %{buildroot}%{_datadir}/%{nam cp lib/*.jar %{buildroot}%{_datadir}/%{name}/lib/ cp lib/bundle/* %{buildroot}%{_datadir}/%{name}/lib/bundle/ rm %{buildroot}%{_datadir}/%{name}/lib/bundle/junit.jar -cp lib/os-specific/linux/*.jar %{buildroot}%{_datadir}/%{name}/lib/ +#cp lib/os-specific/linux/*.jar %{buildroot}%{_datadir}/%{name}/lib/ # copy the native libs %ifarch i386 i586 i686 diff --git a/jitsi.spec.old b/jitsi.spec.old deleted file mode 100644 index ec6374e..0000000 --- a/jitsi.spec.old +++ /dev/null @@ -1,125 +0,0 @@ -#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 - - -%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