diff --git a/.abf.yml b/.abf.yml index 2e4576a..7e6ae5e 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,7 +1,7 @@ removed_sources: - jitsi-src-2.2.4603.9615.zip: f94c36c2759184cc94b4029dde08c35efbe5a547 + jitsi-src-2.2.4603.9615.zip: b4c7607b036a20904d4f4369764bee526b02c0fb 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 + jitsi-src-2.6.5390.zip: 8cc9b15f83f4dc033e8e6508aa20ea85a5a846af diff --git a/jitsi.spec b/jitsi.spec index 7d83a5c..85e1884 100644 --- a/jitsi.spec +++ b/jitsi.spec @@ -1,14 +1,14 @@ %define debug_package %nil -%define label latest +%define label 5390 Name: jitsi -Version: 2.4 +Version: 2.6 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 @@ -29,7 +29,7 @@ freely available under the terms of the GNU Lesser General Public License. %setup -q -n %{name} %build -ant rebuild +ant -Dlabel=%{label} rebuild %install @@ -43,8 +43,8 @@ mkdir -p -m 0755 %{buildroot}%{_bindir} \ %{buildroot}%{_docdir}/%{name} \ %{buildroot}%{_mandir}/man1 \ %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/pixmaps - + %{buildroot}%{_datadir}/pixmaps \ + %{buildroot}%{_libdir}/%{name} # 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 @@ -86,9 +86,9 @@ rm %{buildroot}%{_datadir}/%{name}/lib/bundle/junit.jar # copy the native libs %ifarch i386 i586 i686 -install -Dm0644 lib/native/linux/* %{buildroot}%{_datadir}/%{name}/lib/native/ +install -Dm0644 lib/native/linux/* %{buildroot}%{_libdir}/%{name}/ %else -install -Dm0644 lib/native/linux-64/* %{buildroot}%{_datadir}/%{name}/lib/native/ +install -Dm0644 lib/native/linux-64/* %{buildroot}%{_libdir}/%{name}/ %endif # copy the resources @@ -108,11 +108,12 @@ sed -i -e "s/\/launchutils.jar//" $RPM_BUILD_ROOT/usr/bin/jitsi %files %defattr(-,root,root,-) -%{_bindir}/jitsi -#{_libdir}/jitsi +%doc %{_mandir}/man*/* +%{_bindir}/%{name} +%{_libdir}/%{name}/*.so %{_datadir}/%{name} %{_datadir}/applications/%{name}* %{_datadir}/pixmaps/%{name}* -%doc %{_mandir}/man*/* + %changelog