Merge branch 'rawhide' into epel8

.gitignore

@@ -24,3 +24,5 @@
 /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
+/keepassxc-2.7.1-src.tar.xz

keepassxc.spec

@@ -2,8 +2,8 @@
 # EPEL7 not possible because libgcrypt version is 1.5
 
 Name:           keepassxc
-Version:        2.6.6
+Version:        2.7.1
-Release:        5%{?dist}
+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,43 +12,57 @@ 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:  botan2-devel
 BuildRequires:  cmake >= 3.1
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++ >= 4.7
-BuildRequires:  qt5-qtbase-devel >= 5.2
+BuildRequires:  libappstream-glib
-BuildRequires:  qt5-qttools-devel >= 5.2
-BuildRequires:  qt5-qtsvg-devel
-BuildRequires:  qrencode-devel
 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-compat-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
+
+# 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
+# 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
@@ -124,20 +138,21 @@ install -D -m 644 -p x-keepassxc.desktop \
 
 #install appdata files
 
-%find_lang keepassx --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
+%{_datadir}/keepassxc/wordlists
 %{_datadir}/applications/org.%{name}.KeePassXC.desktop
 %{_datadir}/metainfo/org.%{name}.KeePassXC.appdata.xml
 %{_datadir}/mimelnk
@@ -152,6 +167,20 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam
 %endif
 
 %changelog
+* Wed Apr 06 2022 Germano Massullo <germano.massullo@gmail.com> - 2.7.1-1
+- 2.7.1 release
+
+* Tue Mar 22 2022 Germano Massullo <germano.massullo@gmail.com> - 2.7.0-1
+- 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 <jgrulich@redhat.com> - 2.6.6-6
+- Rebuild (qt5)
+
 * Mon Feb 21 2022 Germano Massullo <germano.massullo@gmail.com> - 2.6.6-5
 - User pewpeww improved xcb.patch - https://src.fedoraproject.org/rpms/keepassxc/pull-request/1
 

sources

@@ -1 +1 @@
-SHA512 (keepassxc-2.6.6-src.tar.xz) = 175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
+SHA512 (keepassxc-2.7.1-src.tar.xz) = ca0950e7c0e6d119b7c7122ac2684084a668be6798eb22a6e1271f8e05a86c943203f7f1c56b948deab3948f6b376e838db364e5bc5f6f7bc73ba72ad9461299