Update to 2.7.6 - Closes rhbz#2232336

Change to always include patches as part of the srpm creation and then
apply them conditionally. This way we can use COPR or other tools
independently of which release of Fedora or RHEL is used to create the
srpm.

.gitignore

@@ -31,3 +31,5 @@
 /keepassxc-2.7.4-src.tar.xz.sig
 /keepassxc-2.7.5-src.tar.xz
 /keepassxc-2.7.5-src.tar.xz.sig
+/keepassxc-2.7.6-src.tar.xz.sig
+/keepassxc-2.7.6-src.tar.xz

keepassxc.spec

@@ -2,8 +2,8 @@
 # EPEL7 not possible because libgcrypt version is 1.5
 
 Name:           keepassxc
-Version:        2.7.5
+Version:        2.7.6
-Release:        3%{?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:            https://keepassxc.org/
@@ -37,10 +37,7 @@ Source2:        https://keepassxc.org/keepassxc_master_signing_key.asc
 # https://bugzilla.redhat.com/show_bug.cgi?id=2186217
 # disabling the patch fixes the problem, therefore it has been disabled on
 # Fedora >= 38
-
-%if (%{defined rhel} || (%{defined fedora} && 0%{?fedora} < 38))
 Patch0:         xcb.patch
-%endif
 
 BuildRequires:  botan2-devel
 BuildRequires:  cmake >= 3.1
@@ -130,7 +127,13 @@ information can be considered as quite safe.
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1
+
+%setup -q
+
+# Apply xcb.patch only for EPEL and Fedora <38
+%if (%{defined rhel} || (%{defined fedora} && 0%{?fedora} < 38))
+%autopatch -p1
+%endif
 
 # Older version of appstream-util can't parse some url types
 %if (%{defined rhel} && 0%{?rhel} <= 9)
@@ -195,6 +198,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Aug 16 2023 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2.7.6-1
+- Update to 2.7.6
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (keepassxc-2.7.5-src.tar.xz) = 904fe319cb18a06e86162a0a4c4fbcac05b9e6936b69c5362b7fe2b89cd268061cadd6854f7dde80d3e8cfa2b9e22c27974277f3db1f6c32a2720e01a4c4aa1b
+SHA512 (keepassxc-2.7.6-src.tar.xz.sig) = 0abc5d8512d71fdc4cef794ce31f0edb06811529ef768a5472cffedacd35e2ea63f450a7c20d755816ee0a3a02a5d14e368078431eb4260ca815d99bfaf1f350
-SHA512 (keepassxc-2.7.5-src.tar.xz.sig) = 174707634c54da63cdbd2935e2c39d530ecdfc78fb3f9015b384d4b4c3cf12111ac4eb122aa3f9269b7823db49cada7154af8cd27691cefc72b2d1dd86229b00
+SHA512 (keepassxc-2.7.6-src.tar.xz) = 58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812