diff --git a/.gitignore b/.gitignore index 0ffc0fc..687da56 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ /vacuum-im-52c2a8c.tar.gz /vacuum-im-9f3952b.tar.gz /vacuum-im-b6c5dad.tar.gz -/vacuum-im-0abd5e1.tar.gz diff --git a/sources b/sources index 2c51414..008c27b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vacuum-im-0abd5e1.tar.gz) = 2a22b9b75e42c38f82280dd0ad8048975e716a3ea222449711a2bf52567aae5579ef84d60db5eaa0efed3b8ebb243e1b543fcd6d191ce25ce279fe6f5e24ba14 +SHA512 (vacuum-im-b6c5dad.tar.gz) = f7c7ab2d3820444476d1972d33ae29705f705e0a09640f5032df4c2000b06328c2c5080ec69787b4675f33d5de6d1e6ae2c6d2c2bfe366b47652b1ef6547e0ef diff --git a/vacuum-im-fix-type-mismatch.patch b/vacuum-im-fix-type-mismatch.patch deleted file mode 100644 index 0887254..0000000 --- a/vacuum-im-fix-type-mismatch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/thirdparty/minizip/zip.c.orig 2024-08-05 10:01:44.177174058 +0200 -+++ src/thirdparty/minizip/zip.c 2024-08-05 10:28:07.217053683 +0200 -@@ -1252,7 +1252,7 @@ - unsigned char bufHead[RAND_HEAD_LEN]; - unsigned int sizeHead; - zi->ci.encrypt = 1; -- zi->ci.pcrc_32_tab = get_crc_table(); -+ zi->ci.pcrc_32_tab = (const long unsigned int*) get_crc_table(); - /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/ - - sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting); diff --git a/vacuum-im.spec b/vacuum-im.spec index fb9668e..ce7dcc6 100644 --- a/vacuum-im.spec +++ b/vacuum-im.spec @@ -1,21 +1,19 @@ %undefine __cmake_in_source_build -# https://github.com/vacuum-im/vacuum-im/commit/0abd5e11dd3e2538b8c47f5a06febedf73ae99ee -%global commit 0abd5e11dd3e2538b8c47f5a06febedf73ae99ee +# https://github.com/vacuum-im/vacuum-im/commit/b6c5dad75568660ff19cdb29d93439af2f65be6d +%global commit b6c5dad75568660ff19cdb29d93439af2f65be6d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20211209 +%global commitdate 20200608 %global sname vacuum Name: %{sname}-im Summary: XMPP/Jabber client Version: 1.3.0 -Release: 0.37.%{commitdate}git%{shortcommit}%{?dist} -# Automatically converted from old format: GPLv3 - review is highly recommended. -License: GPL-3.0-only +Release: 0.20.%{commitdate}git%{shortcommit}%{?dist} +License: GPLv3 Url: http://www.vacuum-im.org/ Source0: https://github.com/Vacuum-IM/vacuum-im/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Patch0: %{name}-fix-building-with-qt5.5.patch -Patch1: %{name}-fix-type-mismatch.patch BuildRequires: cmake BuildRequires: pkgconfig(Qt5Core) @@ -57,16 +55,15 @@ This package contains images, themes and translations. %package devel Summary: Development Files for Vacuum-IM -# Automatically converted from old format: GPLv3 - review is highly recommended. -License: GPL-3.0-only +License: GPLv3 Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package includes files needed to develop Vacuum-IM modules. %prep -%autosetup -p0 -n %{name}-%{commit} -#%%patch0 -p0 +%setup -q -n %{name}-%{commit} +%patch0 -p0 # Fix W: wrong-file-end-of-line-encoding /usr/share/doc/vacuum-im/AUTHORS sed -i 's/\r$//' AUTHORS CHANGELOG README TRANSLATORS @@ -141,57 +138,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.metai %{_includedir}/%{name} %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.3.0-0.37.20211209git0abd5e1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jun 13 2026 Yaakov Selkowitz - 1.3.0-0.36.20211209git0abd5e1 -- Rebuilt for openssl 4.0 - -* Sat Jan 17 2026 Fedora Release Engineering - 1.3.0-0.35.20211209git0abd5e1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.3.0-0.34.20211209git0abd5e1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.3.0-0.33.20211209git0abd5e1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Aug 05 2024 Martin Gansser - 1.3.0-0.32.20211209git0abd5e1 -- Add %%{name}-fix-type-mismatch.patch - -* Mon Jul 29 2024 Miroslav Suchý - 1.3.0-0.31.20211209git0abd5e1 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.3.0-0.30.20211209git0abd5e1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.3.0-0.29.20211209git0abd5e1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.3.0-0.28.20211209git0abd5e1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Apr 12 2023 Martin Gansser - 1.3.0-0.27.20211209git0abd5e1 -- Update to 1.3.0-0.27.20211209git0abd5e1 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.3.0-0.26.20200608gitb6c5dad -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.3.0-0.25.20200608gitb6c5dad -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.3.0-0.24.20200608gitb6c5dad -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.3.0-0.23.20200608gitb6c5dad -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 03 2021 Martin Gansser - 1.3.0-0.22.20200608gitb6c5dad -- Rebuilt - -* Wed Jan 27 2021 Fedora Release Engineering - 1.3.0-0.21.20200608gitb6c5dad -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Sat Aug 01 2020 Fedora Release Engineering - 1.3.0-0.20.20200608gitb6c5dad - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild