From c3318da503e940693cbbb26156196c902be49202 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 5 Jan 2020 11:02:41 -0500 Subject: [PATCH 1/7] Update to 2.5.2 --- .gitignore | 1 + keepassxc.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 81de63f..1a74a8f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /keepassxc-2.4.3-src.tar.xz /keepassxc-2.5.0-src.tar.xz /keepassxc-2.5.1-src.tar.xz +/keepassxc-2.5.2-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index 7bac1fb..7404c89 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -1,7 +1,7 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.5.1 +Version: 2.5.2 Release: 1%{?dist} Summary: Cross-platform password manager License: Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain @@ -122,6 +122,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Sun Jan 05 2020 Mukundan Ragavan - 2.5.2-1 +- Update to 2.5.2 + * Tue Nov 12 2019 Germano Massullo - 2.5.1-1 - 2.5.1 release diff --git a/sources b/sources index 49f0f73..9a255a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.5.1-src.tar.xz) = 5500a0e697758e7616754d1b612ad7a64485d9efa1aeb0c3714060db50ffd39ea0aaa0c42d86d17044b834f32e99172ea94bc2485d396a381c8e9212d8be8b37 +SHA512 (keepassxc-2.5.2-src.tar.xz) = f87408362e5fbba10e2e66ff1cead2f8495214197e142c16cd3c95ea47956570b6cfc561d7b593c9a962f476637b8bd6b5e21e2fc3e4f20224506bd97d16bb23 From 23d95c20fdb7e5f4216321da3e510abc91961203 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Mon, 20 Jan 2020 08:27:54 -0500 Subject: [PATCH 2/7] Update to 2.5.3 --- .gitignore | 1 + keepassxc.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1a74a8f..13ba8b2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /keepassxc-2.5.0-src.tar.xz /keepassxc-2.5.1-src.tar.xz /keepassxc-2.5.2-src.tar.xz +/keepassxc-2.5.3-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index 7404c89..246343e 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -1,7 +1,7 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.5.2 +Version: 2.5.3 Release: 1%{?dist} Summary: Cross-platform password manager License: Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain @@ -122,6 +122,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Mon Jan 20 2020 Mukundan Ragavan - 2.5.3-1 +- Update to 2.5.3 + * Sun Jan 05 2020 Mukundan Ragavan - 2.5.2-1 - Update to 2.5.2 diff --git a/sources b/sources index 9a255a1..1b18efd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.5.2-src.tar.xz) = f87408362e5fbba10e2e66ff1cead2f8495214197e142c16cd3c95ea47956570b6cfc561d7b593c9a962f476637b8bd6b5e21e2fc3e4f20224506bd97d16bb23 +SHA512 (keepassxc-2.5.3-src.tar.xz) = 8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6 From 12d41af4727d188fd18797c0d0e1e869197a439d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 06:59:24 +0000 Subject: [PATCH 3/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepassxc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index 246343e..2c99a00 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -2,7 +2,7 @@ Name: keepassxc Version: 2.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform password manager License: Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain URL: http://www.keepassxc.org/ @@ -122,6 +122,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Jan 20 2020 Mukundan Ragavan - 2.5.3-1 - Update to 2.5.3 From 6af34bf281a5a8a8a222e51f37107c0d414229b2 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Thu, 9 Apr 2020 17:31:54 -0400 Subject: [PATCH 4/7] Update to 2.5.4 --- .gitignore | 1 + keepassxc.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 13ba8b2..0423237 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /keepassxc-2.5.1-src.tar.xz /keepassxc-2.5.2-src.tar.xz /keepassxc-2.5.3-src.tar.xz +/keepassxc-2.5.4-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index 2c99a00..49e041b 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -1,8 +1,8 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.5.3 -Release: 2%{?dist} +Version: 2.5.4 +Release: 1%{?dist} Summary: Cross-platform password manager License: Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain URL: http://www.keepassxc.org/ @@ -122,6 +122,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Thu Apr 09 2020 Mukundan Ragavan - 2.5.4-1 +- Update to 2.5.4 + * Wed Jan 29 2020 Fedora Release Engineering - 2.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 1b18efd..9538d7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.5.3-src.tar.xz) = 8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6 +SHA512 (keepassxc-2.5.4-src.tar.xz) = 8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3 From 186495914aec75dc5eae682819c4081141942076 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 1 Jul 2020 15:19:14 -0600 Subject: [PATCH 5/7] Disable LTO --- keepassxc.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index 49e041b..bd7b028 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -2,7 +2,7 @@ Name: keepassxc Version: 2.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform password manager License: Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain URL: http://www.keepassxc.org/ @@ -61,6 +61,12 @@ information can be considered as quite safe. %autosetup %build +# This package fails to build with LTO due to undefined symbols. LTO +# was disabled in OpenSuSE as well, but with no real explanation why +# beyond the undefined symbols. It really shold be investigated further. +# Disable LTO +%define _lto_cflags %{nil} + mkdir build cd build @@ -122,6 +128,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Wed Jul 01 2020 Jeff Law - 2.5.4-2 +- Diable LTO + * Thu Apr 09 2020 Mukundan Ragavan - 2.5.4-1 - Update to 2.5.4 From 201d6fe86d67cfec1b37cea9b72e38d5907e86a0 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Wed, 8 Jul 2020 15:35:01 -0400 Subject: [PATCH 6/7] Update to 2.6.0 --- .gitignore | 1 + keepassxc.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0423237..9bda66f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /keepassxc-2.5.2-src.tar.xz /keepassxc-2.5.3-src.tar.xz /keepassxc-2.5.4-src.tar.xz +/keepassxc-2.6.0-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index bd7b028..9362e41 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -1,8 +1,8 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.5.4 -Release: 2%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: Cross-platform password manager License: Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain URL: http://www.keepassxc.org/ @@ -37,6 +37,9 @@ BuildRequires: quazip-qt5-devel BuildRequires: ykpers-devel BuildRequires: zlib-devel BuildRequires: libappstream-glib +BuildRequires: qt5-qtbase-private-devel +BuildRequires: readline-devel +BuildRequires: rubygem-asciidoctor %description KeePassXC is a community fork of KeePassX @@ -128,6 +131,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Tue Jul 07 2020 Mukundan Ragavan - 2.6.0-1 +- Update to 2.6.0 + * Wed Jul 01 2020 Jeff Law - 2.5.4-2 - Diable LTO diff --git a/sources b/sources index 9538d7a..f8bcbdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.5.4-src.tar.xz) = 8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3 +SHA512 (keepassxc-2.6.0-src.tar.xz) = c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17 From bebd7809ea94a8cd6cbe8dc6f51010759e4f52a3 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sat, 18 Jul 2020 14:45:33 +0200 Subject: [PATCH 7/7] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- keepassxc.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/keepassxc.spec b/keepassxc.spec index 9362e41..958401b 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -1,3 +1,4 @@ +%undefine __cmake_in_source_build # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc @@ -8,11 +9,7 @@ License: Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv URL: http://www.keepassxc.org/ Source0: https://github.com/keepassxreboot/keepassxc/releases/download/%{version}/keepassxc-%{version}-src.tar.xz -%if 0%{?el7} -BuildRequires: cmake3 >= 3.1 -%else BuildRequires: cmake >= 3.1 -%endif BuildRequires: desktop-file-utils BuildRequires: gcc-c++ >= 4.7 BuildRequires: qt5-qtbase-devel >= 5.2 @@ -70,21 +67,16 @@ information can be considered as quite safe. # Disable LTO %define _lto_cflags %{nil} -mkdir build -cd build - -%cmake .. \ +%cmake \ -DWITH_TESTS=OFF \ -DWITH_XC_ALL=ON \ -DWITH_XC_KEESHARE_SECURE=ON \ -WITH_XC_UPDATECHECK=OFF \ -DCMAKE_BUILD_TYPE=Release - -%make_build +%cmake_build %install -cd build -%make_install +%cmake_install desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ @@ -110,7 +102,7 @@ install -D -m 644 -p x-keepassxc.desktop \ %find_lang keepassx --with-qt %check -ctest -V %{?_smp_mflags} +%ctest desktop-file-validate %{buildroot}%{_datadir}/applications/org.%{name}.KeePassXC.desktop appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml