From 84db5f50579af7fae42b780877c7c207d6a9ac5a Mon Sep 17 00:00:00 2001 From: User Date: Fri, 3 Jan 2020 01:36:23 +0300 Subject: [PATCH] Update to 5623 --- .abf.yml | 7 +------ jitsi.spec | 14 ++++++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.abf.yml b/.abf.yml index 0ee34c0..cd94436 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,10 +1,5 @@ -removed_sources: - jitsi-src-2.2.4603.9615.zip: b4c7607b036a20904d4f4369764bee526b02c0fb - jitsi-src-2.6.5390.zip: 8cc9b15f83f4dc033e8e6508aa20ea85a5a846af - jitsi-src-2.8.5426.zip: 97e2b6d964d2a6f7dc1ff87ea9335d106655f2bc - jitsi-src-2.9.5500.zip: 0fae1ae379c017381930e8a0daa838e7e4d3b629 - jitsi-src-2.9.5515.zip: 69160b56805878edc05b3dca2d4b13015e1f264f sources: + jitsi-5623.tar.gz: b88548a17bf3c651e7d2b899a6218e8c5480c0df jitsi-src-1.0-latest.zip: b21166e30103bd0440ac722cbb53bdcdc7c179d7 jitsi-src-2.0-latest.zip: 3726f1db2d2d5c989de2d2e2aac6c77289a2840c jitsi-src-2.4-latest.zip: 9ee55e41ab32b497e0267f81070a1b0a9abb898f diff --git a/jitsi.spec b/jitsi.spec index b5eed8d..c485e73 100644 --- a/jitsi.spec +++ b/jitsi.spec @@ -1,8 +1,8 @@ %global JAVA_HOME /usr/lib/jvm/java-openjdk %define debug_package %nil -%define label 5534 +%define label 5623 %define suffix rolling -%define version 2.9 +%define version 2.11 Name: jitsi Version: %{version}.%{label} @@ -11,13 +11,14 @@ 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}.zip +#Source: http://download.jitsi.org/jitsi/nightly/src/%{name}-src-%{version}.zip +Source0: https://github.com/jitsi/jitsi/archive/%{label}/%{name}-%{label}.tar.gz Source1: %{name}.desktop Source2: %{name}.bak Patch1: %{name}.sh.patch BuildRoot: %{_topdir}/buildroot AutoReqProv: no -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: gzip @@ -32,11 +33,12 @@ 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} +%setup -q -n %{name}-%{label} #patch1 %build -JAVA_HOME=/usr/lib/jvm/java-openjdk ant -Dlabel=%{label} rebuild +#JAVA_HOME=/usr/lib/jvm/java-openjdk +ant -Dlabel=%{label} rebuild %install