From a5a5e06565382524f41e43738b200779b787567f Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 26 Aug 2022 06:46:41 +0900 Subject: [PATCH] Revert nettle version pinning as it doesn't work well in side-tag This reverts commit 7fecd39c3d11dc864f71f779a61409695b25cd68. As there is a circular dependency between gnutls and gnupg2, that commit added some fragility to the build process. Related: #2097327 Signed-off-by: Daiki Ueno --- gnutls.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnutls.spec b/gnutls.spec index 9a3495c..6cbead5 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -13,7 +13,7 @@ print(string.sub(hash, 0, 16)) } Version: 3.7.6 -Release: 9%{?dist} +Release: 10%{?dist} # not upstreamed Patch: gnutls-3.6.7-no-now-guile.patch Patch: gnutls-3.2.7-rpath.patch @@ -100,10 +100,6 @@ Source100: gmp-6.2.1.tar.xz # Taken from the main gmp package Source101: gmp-6.2.1-intel-cet.patch -%if %{with fips} -Requires: nettle%{?_isa} = 3.8-2 -%endif - # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174 Provides: bundled(gnulib) = 20130424 @@ -394,6 +390,9 @@ make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null %endif %changelog +* Thu Aug 25 2022 Daiki Ueno - 3.7.6-10 +- Revert nettle version pinning as it doesn't work well in side-tag + * Thu Aug 25 2022 Daiki Ueno - 3.7.6-9 - Pin nettle version in Requires when compiled with FIPS