From 7446fbf2f386c7158a72619ec116f80323f4bc3b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 8 Mar 2022 08:51:53 +0100 Subject: [PATCH 01/10] Rebuild (qt5) --- keepassxc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index 8cd4f40..8506409 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -3,7 +3,7 @@ Name: keepassxc Version: 2.6.6 -Release: 5%{?dist} +Release: 6%{?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/ @@ -152,6 +152,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %endif %changelog +* Tue Mar 08 2022 Jan Grulich - 2.6.6-6 +- Rebuild (qt5) + * Mon Feb 21 2022 Germano Massullo - 2.6.6-5 - User pewpeww improved xcb.patch - https://src.fedoraproject.org/rpms/keepassxc/pull-request/1 From 2ad033636d9390e2c632b45e79bdeaa074c58df5 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Wed, 23 Mar 2022 11:34:47 +0100 Subject: [PATCH 02/10] 2.7.0 release --- .gitignore | 1 + keepassxc.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 21d171b..23f8e24 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /keepassxc-2.6.3-src.tar.xz /keepassxc-2.6.4-src.tar.xz /keepassxc-2.6.6-src.tar.xz +/keepassxc-2.7.0-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index 8506409..5897803 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.6 -Release: 6%{?dist} +Version: 2.7.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/ @@ -12,8 +12,14 @@ Source0: https://github.com/keepassxreboot/keepassxc/releases/download/%{ # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/ # read also https://github.com/keepassxreboot/keepassxc/pull/3520/files # -# Patch improved by pewpeww https://src.fedoraproject.org/rpms/keepassxc/pull-request/1 +# Patch0 improved by pewpeww https://src.fedoraproject.org/rpms/keepassxc/pull-request/1 +# +# 23 March 2022 Germano Massullo's update: Jan Grulich said that Qt patch https://code.qt.io/cgit/qt/qtbase.git/commit/?id=dda7dab8274991e4a61a97c352d4367f8f815bb9 +# is included in qt5-qtbase in all Fedora versions but it is not in RHEL qt5-qtbase package. +# So I think it is no longer needed in Fedora +%if 0%{?el8} Patch0: xcb.patch +%endif BuildRequires: cmake >= 3.1 BuildRequires: desktop-file-utils @@ -152,6 +158,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %endif %changelog +* Tue Mar 22 2022 Germano Massullo - 2.7.0-1 +- 2.7.0 release + * Tue Mar 08 2022 Jan Grulich - 2.6.6-6 - Rebuild (qt5) diff --git a/sources b/sources index 0ce3643..1644829 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.6.6-src.tar.xz) = 175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b +SHA512 (keepassxc-2.7.0-src.tar.xz) = 0fc436ae5fb8fb82765a0c2df20c9567b1baf6aceff1e08c843a151ddcc0920d4cb2d416aebd89bdd8f1b53efb0a4ad0f579955c6943ee66c20b0becbb978e12 From 03788aa6910e53c64213175ee9901be21758be2e Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Wed, 23 Mar 2022 15:58:29 +0100 Subject: [PATCH 03/10] spec file improvements --- keepassxc.spec | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/keepassxc.spec b/keepassxc.spec index 5897803..3a8219e 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -21,40 +21,45 @@ Source0: https://github.com/keepassxreboot/keepassxc/releases/download/%{ Patch0: xcb.patch %endif +BuildRequires: botan2-devel BuildRequires: cmake >= 3.1 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ >= 4.7 -BuildRequires: qt5-qtbase-devel >= 5.2 -BuildRequires: qt5-qttools-devel >= 5.2 -BuildRequires: qt5-qtsvg-devel -BuildRequires: qrencode-devel +BuildRequires: libappstream-glib BuildRequires: libargon2-devel BuildRequires: libcurl-devel BuildRequires: libgcrypt-devel >= 1.7 BuildRequires: libmicrohttpd-devel BuildRequires: libsodium-devel +BuildRequires: libusb1-devel BuildRequires: libXi-devel BuildRequires: libXtst-devel BuildRequires: libyubikey-devel +BuildRequires: minizip-devel +BuildRequires: pcsc-lite-devel +BuildRequires: qrencode-devel +BuildRequires: readline-devel +BuildRequires: qt5-qtbase-devel >= 5.2 +BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-qttools-devel >= 5.2 BuildRequires: qt5-qtx11extras-devel -# 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 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 + +# KeePassXC bundles the ykcore code due to lack of support from Yubico and +# stratification of version across various operating system distros. Additionally, +# KeePassXC has modified the API of ykcore to make it more functional when using +# non-YubiKey keys (ie, OnlyKey). +Provides: bundled(ykcore) + %description KeePassXC is a community fork of KeePassX KeePassXC is an application for people with extremely high demands on secure @@ -160,6 +165,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %changelog * Tue Mar 22 2022 Germano Massullo - 2.7.0-1 - 2.7.0 release +- adds BuildRequires: botan2-devel +- adds BuildRequires: pcsc-lite-devel +- replaces BuildRequires: quazip-qt5-devel with BuildRequires: minizip-devel * Tue Mar 08 2022 Jan Grulich - 2.6.6-6 - Rebuild (qt5) From bf74b6744d986a83acf99bc9738586b9b08a9e64 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Thu, 24 Mar 2022 15:57:16 +0100 Subject: [PATCH 04/10] replaced minizip with minizip-compat --- keepassxc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keepassxc.spec b/keepassxc.spec index 3a8219e..011ea44 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -35,7 +35,7 @@ BuildRequires: libusb1-devel BuildRequires: libXi-devel BuildRequires: libXtst-devel BuildRequires: libyubikey-devel -BuildRequires: minizip-devel +BuildRequires: minizip-compat-devel BuildRequires: pcsc-lite-devel BuildRequires: qrencode-devel BuildRequires: readline-devel @@ -167,7 +167,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam - 2.7.0 release - adds BuildRequires: botan2-devel - adds BuildRequires: pcsc-lite-devel -- replaces BuildRequires: quazip-qt5-devel with BuildRequires: minizip-devel +- replaces BuildRequires: quazip-qt5-devel with BuildRequires: minizip-compat-devel * Tue Mar 08 2022 Jan Grulich - 2.6.6-6 - Rebuild (qt5) From 6c2ab4de76bb408d2d1ca68e7459f5f248e6d361 Mon Sep 17 00:00:00 2001 From: Leonardo Amaral Date: Mon, 28 Mar 2022 14:11:19 +0000 Subject: [PATCH 05/10] Fix a typo at find_lang macro This commit is a quick fix to find_lang parameter typo error --- keepassxc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index 011ea44..2cb8632 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -135,7 +135,7 @@ install -D -m 644 -p x-keepassxc.desktop \ #install appdata files -%find_lang keepassx --with-qt +%find_lang keepassxc --with-qt %check %ctest From 1e3fdf1e0b0f7b9f60fdf5756a8e9955dcd7acdb Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Mon, 28 Mar 2022 19:12:37 +0200 Subject: [PATCH 06/10] minor fixes --- keepassxc.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/keepassxc.spec b/keepassxc.spec index 2cb8632..4a6c522 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -54,6 +54,8 @@ BuildRequires: zlib-devel BuildRequires: rubygem-asciidoctor %endif +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} + # KeePassXC bundles the ykcore code due to lack of support from Yubico and # stratification of version across various operating system distros. Additionally, # KeePassXC has modified the API of ykcore to make it more functional when using @@ -135,20 +137,21 @@ install -D -m 644 -p x-keepassxc.desktop \ #install appdata files -%find_lang keepassxc --with-qt +%find_lang %{name} --with-qt %check %ctest desktop-file-validate %{buildroot}%{_datadir}/applications/org.%{name}.KeePassXC.desktop appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml -%files +%files -f %{name}.lang %doc README.md %license COPYING LICENSE* %{_bindir}/keepassxc %{_bindir}/keepassxc-cli %{_bindir}/keepassxc-proxy -%{_datadir}/keepassxc +%dir %{_datadir}/keepassxc +%{_datadir}/keepassxc/wordlists %{_datadir}/applications/org.%{name}.KeePassXC.desktop %{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml %{_datadir}/mimelnk @@ -167,6 +170,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam - 2.7.0 release - adds BuildRequires: botan2-devel - adds BuildRequires: pcsc-lite-devel +- adds Provides: bundled(ykcore) +- enforcing on the user system, Qt version to be the same one used to build KeepassXC - replaces BuildRequires: quazip-qt5-devel with BuildRequires: minizip-compat-devel * Tue Mar 08 2022 Jan Grulich - 2.6.6-6 From 06e8e55206099a8abf1f34305a9e3465330c5b7e Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Mon, 28 Mar 2022 19:13:42 +0200 Subject: [PATCH 07/10] removes BuildRequires: qt5-qtbase-private-devel --- keepassxc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index 4a6c522..2485ea3 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -40,7 +40,6 @@ BuildRequires: pcsc-lite-devel BuildRequires: qrencode-devel BuildRequires: readline-devel BuildRequires: qt5-qtbase-devel >= 5.2 -BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qttools-devel >= 5.2 BuildRequires: qt5-qtx11extras-devel @@ -172,6 +171,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam - adds BuildRequires: pcsc-lite-devel - adds Provides: bundled(ykcore) - enforcing on the user system, Qt version to be the same one used to build KeepassXC +- removes BuildRequires: qt5-qtbase-private-devel - replaces BuildRequires: quazip-qt5-devel with BuildRequires: minizip-compat-devel * Tue Mar 08 2022 Jan Grulich - 2.6.6-6 From 534fbf6e9e1afcbdd10f8ceee43da01c7d204998 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Mon, 28 Mar 2022 20:04:01 +0200 Subject: [PATCH 08/10] re-adds BuildRequires: qt5-qtbase-private-devel --- keepassxc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index 2485ea3..b0df2e9 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -40,6 +40,7 @@ BuildRequires: pcsc-lite-devel BuildRequires: qrencode-devel BuildRequires: readline-devel BuildRequires: qt5-qtbase-devel >= 5.2 +BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qttools-devel >= 5.2 BuildRequires: qt5-qtx11extras-devel @@ -53,6 +54,7 @@ BuildRequires: zlib-devel BuildRequires: rubygem-asciidoctor %endif +# enforces on the user system, Qt version to be the same one used to build KeepassXC %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} # KeePassXC bundles the ykcore code due to lack of support from Yubico and @@ -171,7 +173,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam - adds BuildRequires: pcsc-lite-devel - adds Provides: bundled(ykcore) - enforcing on the user system, Qt version to be the same one used to build KeepassXC -- removes BuildRequires: qt5-qtbase-private-devel - replaces BuildRequires: quazip-qt5-devel with BuildRequires: minizip-compat-devel * Tue Mar 08 2022 Jan Grulich - 2.6.6-6 From 978e804f5481da3f851de1363226eb347326eca6 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Mon, 28 Mar 2022 20:15:30 +0200 Subject: [PATCH 09/10] minor fix --- keepassxc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index b0df2e9..697d08b 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -151,7 +151,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %{_bindir}/keepassxc %{_bindir}/keepassxc-cli %{_bindir}/keepassxc-proxy -%dir %{_datadir}/keepassxc +%{_datadir}/keepassxc %{_datadir}/keepassxc/wordlists %{_datadir}/applications/org.%{name}.KeePassXC.desktop %{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml From 538b66aec5ca3a437ee95538db9227b1f2c9cffe Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Wed, 6 Apr 2022 20:00:07 +0200 Subject: [PATCH 10/10] 2.7.1 release --- .gitignore | 1 + keepassxc.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 23f8e24..7c3757b 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /keepassxc-2.6.4-src.tar.xz /keepassxc-2.6.6-src.tar.xz /keepassxc-2.7.0-src.tar.xz +/keepassxc-2.7.1-src.tar.xz diff --git a/keepassxc.spec b/keepassxc.spec index 697d08b..a8b57f2 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -2,7 +2,7 @@ # EPEL7 not possible because libgcrypt version is 1.5 Name: keepassxc -Version: 2.7.0 +Version: 2.7.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 @@ -167,6 +167,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %endif %changelog +* Wed Apr 06 2022 Germano Massullo - 2.7.1-1 +- 2.7.1 release + * Tue Mar 22 2022 Germano Massullo - 2.7.0-1 - 2.7.0 release - adds BuildRequires: botan2-devel diff --git a/sources b/sources index 1644829..148999a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepassxc-2.7.0-src.tar.xz) = 0fc436ae5fb8fb82765a0c2df20c9567b1baf6aceff1e08c843a151ddcc0920d4cb2d416aebd89bdd8f1b53efb0a4ad0f579955c6943ee66c20b0becbb978e12 +SHA512 (keepassxc-2.7.1-src.tar.xz) = ca0950e7c0e6d119b7c7122ac2684084a668be6798eb22a6e1271f8e05a86c943203f7f1c56b948deab3948f6b376e838db364e5bc5f6f7bc73ba72ad9461299