From 424c66468b54e73b5d380c2cbe4e6facc4ff8c48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:59:59 +0000 Subject: [PATCH 1/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 958401b..1228002 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -3,7 +3,7 @@ Name: keepassxc Version: 2.6.0 -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/ @@ -123,6 +123,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 07 2020 Mukundan Ragavan - 2.6.0-1 - Update to 2.6.0 From 0f5830695776a14e5e0fddcb577091e088cb0e62 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Thu, 20 Aug 2020 10:34:16 +0200 Subject: [PATCH 2/7] 2.6.1 release --- .gitignore | 1 + keepassxc.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9bda66f..57aeaea 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /keepassxc-2.5.3-src.tar.xz /keepassxc-2.5.4-src.tar.xz /keepassxc-2.6.0-src.tar.xz +/keepassxc-2.6.1-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index 1228002..b164637 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -2,8 +2,8 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.6.1 +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/ @@ -123,6 +123,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Thu Aug 20 2020 Germano Massullo - 2.6.1-1 +- 2.6.1 release + * Tue Jul 28 2020 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index f8bcbdf..b4f3969 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.6.0-src.tar.xz) = c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17 +SHA512 (keepassxc-2.6.1-src.tar.xz) = 9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a From 721bbc199b079f261627e68209274b1a1025fce0 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Fri, 23 Oct 2020 18:59:16 -0400 Subject: [PATCH 3/7] Update to 2.6.2 --- .gitignore | 1 + keepassxc.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 57aeaea..d8a1c3b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /keepassxc-2.5.4-src.tar.xz /keepassxc-2.6.0-src.tar.xz /keepassxc-2.6.1-src.tar.xz +/keepassxc-2.6.2-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index b164637..57f0c76 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -2,7 +2,7 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.6.1 +Version: 2.6.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 @@ -123,6 +123,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Fri Oct 23 2020 Mukundan Ragavan - 2.6.2-1 +- Update to 2.6.2 + * Thu Aug 20 2020 Germano Massullo - 2.6.1-1 - 2.6.1 release diff --git a/sources b/sources index b4f3969..0e452e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.6.1-src.tar.xz) = 9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a +SHA512 (keepassxc-2.6.2-src.tar.xz) = b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1 From ca2699417fb84fcc66ec2c88b4dc0a91ab316dd3 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Mon, 26 Oct 2020 15:47:14 +0100 Subject: [PATCH 4/7] replaced -WITH_XC_UPDATECHECK=OFF with -DWITH_XC_UPDATECHECK=OFF --- keepassxc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/keepassxc.spec b/keepassxc.spec index 57f0c76..e3f762d 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -3,7 +3,7 @@ Name: keepassxc Version: 2.6.2 -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/ @@ -71,7 +71,7 @@ information can be considered as quite safe. -DWITH_TESTS=OFF \ -DWITH_XC_ALL=ON \ -DWITH_XC_KEESHARE_SECURE=ON \ - -WITH_XC_UPDATECHECK=OFF \ + -DWITH_XC_UPDATECHECK=OFF \ -DCMAKE_BUILD_TYPE=Release %cmake_build @@ -123,6 +123,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Mon Oct 26 2020 Germano Massullo - 2.6.2-2 +- replaced -WITH_XC_UPDATECHECK=OFF with -DWITH_XC_UPDATECHECK=OFF Read https://bugzilla.redhat.com/show_bug.cgi?id=1887609 + * Fri Oct 23 2020 Mukundan Ragavan - 2.6.2-1 - Update to 2.6.2 From bb67739a4be75409686d0e77b2e62103180f166b Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Wed, 13 Jan 2021 18:29:50 -0500 Subject: [PATCH 5/7] Update to 2.6.3 --- .gitignore | 1 + keepassxc.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d8a1c3b..f6b3c27 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /keepassxc-2.6.0-src.tar.xz /keepassxc-2.6.1-src.tar.xz /keepassxc-2.6.2-src.tar.xz +/keepassxc-2.6.3-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index e3f762d..8882d81 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -2,14 +2,14 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.6.2 -Release: 2%{?dist} +Version: 2.6.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 URL: http://www.keepassxc.org/ Source0: https://github.com/keepassxreboot/keepassxc/releases/download/%{version}/keepassxc-%{version}-src.tar.xz -BuildRequires: cmake >= 3.1 +BuildRequires: cmake >= 3.1 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ >= 4.7 BuildRequires: qt5-qtbase-devel >= 5.2 @@ -123,6 +123,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_mandir}/man1/%{name}.1* %changelog +* Wed Jan 13 2021 Mukundan Ragavan - 2.6.3-1 +- Update to 2.6.3 + * Mon Oct 26 2020 Germano Massullo - 2.6.2-2 - replaced -WITH_XC_UPDATECHECK=OFF with -DWITH_XC_UPDATECHECK=OFF Read https://bugzilla.redhat.com/show_bug.cgi?id=1887609 diff --git a/sources b/sources index 0e452e0..061bfda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.6.2-src.tar.xz) = b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1 +SHA512 (keepassxc-2.6.3-src.tar.xz) = 37f97c0851731badffc9c40ed2dcc5c8fc200ea96b32281c21cf199799681abbd74fb191140022ad7872d69ee139e12646e19697010f539690e4e0f0f1c92558 From 40e93ccd9cf005e2197dabceaf6cac4e366dfe3e Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Thu, 21 Jan 2021 20:36:27 +0100 Subject: [PATCH 6/7] enabled EPEL8 builds --- keepassxc.spec | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/keepassxc.spec b/keepassxc.spec index 8882d81..ea88994 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -3,7 +3,7 @@ Name: keepassxc Version: 2.6.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/ @@ -25,10 +25,11 @@ BuildRequires: libXi-devel BuildRequires: libXtst-devel BuildRequires: libyubikey-devel BuildRequires: qt5-qtx11extras-devel -# For quazip read https://bugzilla.redhat.com/show_bug.cgi?id=1754061#c1 -%if 0%{?el8} -BuildRequires: quazip-devel -%else +# For EL8 missing quazip read +# https://bugzilla.redhat.com/show_bug.cgi?id=1859390 +# https://bugzilla.redhat.com/show_bug.cgi?id=1754061#c1 +# https://bugzilla.redhat.com/show_bug.cgi?id=1754155 +%if 0%{?fedora} BuildRequires: quazip-qt5-devel %endif BuildRequires: ykpers-devel @@ -36,8 +37,12 @@ BuildRequires: zlib-devel BuildRequires: libappstream-glib BuildRequires: qt5-qtbase-private-devel BuildRequires: readline-devel +# For EL8 missing rubygem-asciidoctor read +# https://bugzilla.redhat.com/show_bug.cgi?id=1859390 +# https://bugzilla.redhat.com/show_bug.cgi?id=1820896 +%if 0%{?fedora} BuildRequires: rubygem-asciidoctor - +%endif %description KeePassXC is a community fork of KeePassX KeePassXC is an application for people with extremely high demands on secure @@ -66,13 +71,26 @@ information can be considered as quite safe. # beyond the undefined symbols. It really shold be investigated further. # Disable LTO %define _lto_cflags %{nil} - +%if 0%{?fedora} %cmake \ -DWITH_TESTS=OFF \ -DWITH_XC_ALL=ON \ -DWITH_XC_KEESHARE_SECURE=ON \ -DWITH_XC_UPDATECHECK=OFF \ -DCMAKE_BUILD_TYPE=Release +%endif +# -DWITH_XC_DOCS=OFF is needed on EL due missing rubygem-asciidoctor +# For EL8 missing rubygem-asciidoctor read +# https://bugzilla.redhat.com/show_bug.cgi?id=1859390 +# https://bugzilla.redhat.com/show_bug.cgi?id=1820896 +%if 0%{?el8} + -DWITH_TESTS=OFF \ + -DWITH_XC_ALL=ON \ + -DWITH_XC_KEESHARE_SECURE=ON \ + -DWITH_XC_UPDATECHECK=OFF \ + -DWITH_XC_DOCS=OFF \ + -DCMAKE_BUILD_TYPE=Release +%endif %cmake_build %install @@ -119,10 +137,17 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_datadir}/mime/packages/*.xml %{_datadir}/icons/hicolor/*/*/*keepassxc* %{_libdir}/%{name} +# Missing rubygem-asciidoctor in EL8 does not allow having documentation in EL8 +# Read https://bugzilla.redhat.com/show_bug.cgi?id=1859390 +%if 0%{?fedora} %{_mandir}/man1/%{name}-cli.1* %{_mandir}/man1/%{name}.1* +%endif %changelog +* Thu Jan 21 2021 Germano Massullo - 2.6.3-2 +- EL8: disabled documentation, removed rubygem-asciidoctor and quazip depencendies. For bugzilla tickets about missing dependencies, read this spec file near Fedora/EL8 macros + * Wed Jan 13 2021 Mukundan Ragavan - 2.6.3-1 - Update to 2.6.3 From eeb69b6f46c7bd9d2ef5df970c8c641e3a3975bb Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Thu, 21 Jan 2021 20:42:24 +0100 Subject: [PATCH 7/7] fixed spec file syntax --- keepassxc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/keepassxc.spec b/keepassxc.spec index ea88994..1adc7b6 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -84,6 +84,7 @@ information can be considered as quite safe. # https://bugzilla.redhat.com/show_bug.cgi?id=1859390 # https://bugzilla.redhat.com/show_bug.cgi?id=1820896 %if 0%{?el8} +%cmake \ -DWITH_TESTS=OFF \ -DWITH_XC_ALL=ON \ -DWITH_XC_KEESHARE_SECURE=ON \