libgcrypt-1.10.0-1

Resolves: rhbz#2026636

.gitignore

@@ -29,3 +29,5 @@ libgcrypt-1.4.5-hobbled.tar.bz2
 /libgcrypt-1.9.3-hobbled.tar.xz
 /libgcrypt-1.10.0-beta221.tar.bz2
 /libgcrypt-1.10.0-beta221.tar.bz2.sig
+/libgcrypt-1.10.0.tar.bz2
+/libgcrypt-1.10.0.tar.bz2.sig

libgcrypt-1.10.0-soname.patch

@@ -1,27 +0,0 @@
-From 2ef408ba09e93aa9b4e352908c9443b247a656ea Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Thu, 27 Jan 2022 15:35:39 +0100
-Subject: [PATCH] build: Fix accidental SO number bump.
-
---
-Fixes-commit: 65998903f6d17e702fb35b9d4878e33715981298
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6e038412..4f2988eb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,7 +56,7 @@ AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org])
- #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
- #   (No interfaces changed:                   REVISION++)
- LIBGCRYPT_LT_CURRENT=24
--LIBGCRYPT_LT_AGE=0
-+LIBGCRYPT_LT_AGE=4
- LIBGCRYPT_LT_REVISION=0
- ################################################
- 
--- 
-2.34.1
-

libgcrypt-1.9.3-fips-hwfeatures.patch

@@ -1,13 +0,0 @@
-diff -up libgcrypt-1.8.5/src/hwfeatures.c.hw-fips libgcrypt-1.8.5/src/hwfeatures.c
---- libgcrypt-1.8.5/src/hwfeatures.c.hw-fips   2021-06-25 11:55:55.843819137 +0200
-+++ libgcrypt-1.8.5/src/hwfeatures.c   2021-06-25 11:56:00.925895390 +0200
-@@ -205,9 +205,6 @@ _gcry_detect_hw_features (void)
- {
-   hw_features = 0;
- 
--  if (fips_mode ())
--    return; /* Hardware support is not to be evaluated.  */
--
-   parse_hwf_deny_file ();
- 
- #if defined (HAVE_CPU_ARCH_X86)

libgcrypt.spec

@@ -1,16 +1,11 @@
 Name: libgcrypt
 Version: 1.10.0
-Release: 0.3%{?dist}
+Release: 1%{?dist}
 URL: https://www.gnupg.org/
-%global beta -beta221
+Source0: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
-#Source0: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-{version}.tar.bz2
+Source1: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
-#Source1: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-{version}.tar.bz2.sig
-Source0: https://www.gnupg.org/ftp/gcrypt/alpha/libgcrypt/libgcrypt-%{version}%{beta}.tar.bz2
-Source1: https://www.gnupg.org/ftp/gcrypt/alpha/libgcrypt/libgcrypt-%{version}%{beta}.tar.bz2.sig
 Source2: wk@g10code.com
 Patch1: libgcrypt-1.10.0-disable-brainpool.patch
-# Broken soname in the 1.10.0 beta release
-Patch2: libgcrypt-1.10.0-soname.patch
 
 %global gcrylibdir %{_libdir}
 %global gcrysoname libgcrypt.so.20
@@ -45,9 +40,8 @@ in GNU Privacy Guard.  This package contains files needed to develop
 applications using libgcrypt.
 
 %prep
-%setup -q -n libgcrypt-1.10.0%{beta}
+%setup -q
 %patch1 -p1
-%patch2 -p1
 
 %build
 # This package has a configure test which uses ASMs, but does not link the
@@ -170,6 +164,9 @@ mkdir -p -m 755 $RPM_BUILD_ROOT/etc/gcrypt
 %license COPYING
 
 %changelog
+* Wed Feb 02 2022 Jakub Jelen <jjelen@redhat.com> - 1.10.0-1
+- Final release (#2026636)
+
 * Thu Jan 27 2022 Jakub Jelen <jjelen@redhat.com> - 1.10.0-0.3
 - Fix broken soname in the previous beta
 

sources

@@ -1,2 +1,2 @@
-SHA512 (libgcrypt-1.10.0-beta221.tar.bz2) = 38b3633540af64ffa6fcf4438230dad4878baeae666033dcf47ce3178822259852a5b6d74572ddadfd806bbd9acda019d6b17909643082902cae8202fd40a759
+SHA512 (libgcrypt-1.10.0.tar.bz2) = 785c2e14272308956bb6adcea9567c4097edf103122e18cd3907fb42a110a48a5d59c0057f05a438acd7f221c70c7f7ff87e176bd6d7ed99d16e847f9d7be087
-SHA512 (libgcrypt-1.10.0-beta221.tar.bz2.sig) = fcfa24aa14cdfc7a6e8da0e66f17935f6574dd80ba0166070343521e48760a518673fda73b5d5961402e78e392e22a38e4cd241418f42cd587e495c5eb78817c
+SHA512 (libgcrypt-1.10.0.tar.bz2.sig) = 75201612225b206faaae284297e92d1b25dcaf0665bcf1f4c5cc9a3a750a803063d0f7bd0af556dbe419f1276c953ce047554fd18a144a90085a42a7ec885168