Merge branch 'rawhide' into epel8

keepassxc.spec

@@ -3,7 +3,7 @@
 
 Name:           keepassxc
 Version:        2.7.1
-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/
@@ -15,8 +15,10 @@ Source0:        https://github.com/keepassxreboot/keepassxc/releases/download/%{
 # 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.
+# is included in qt5-qtbase in all Fedora versions since 32, even before it landed upstream, but it is not in RHEL qt5-qtbase package.
 # So I think it is no longer needed in Fedora
+# 
+# Concerning upstream Qt6 version, the patch was reverted and kept for Qt 6.3, but concerning keepassxc it is not important since it uses Qt 5
 %if 0%{?el8}
 Patch0:         xcb.patch
 %endif
@@ -35,7 +37,7 @@ BuildRequires:  libusb1-devel
 BuildRequires:  libXi-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  libyubikey-devel
-BuildRequires:  minizip-compat-devel
+BuildRequires:  minizip-devel
 BuildRequires:  pcsc-lite-devel
 BuildRequires:  qrencode-devel
 BuildRequires:  readline-devel
@@ -167,6 +169,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam
 %endif
 
 %changelog
+* Mon Apr 11 2022 Germano Massullo <germano.massullo@gmail.com> - 2.7.1-2
+- replaces BuildRequires: minizip-compat-devel with BuildRequires: minizip-devel
+
 * Wed Apr 06 2022 Germano Massullo <germano.massullo@gmail.com> - 2.7.1-1
 - 2.7.1 release