From ae1ff3c5328e964958f07c69a3cc57b7924d79f8 Mon Sep 17 00:00:00 2001
From: Jakub Martisko <jamartis@redhat.com>
Date: Wed, 18 Aug 2021 12:39:02 +0200
Subject: [PATCH] FIPS: move to .hmac files to the fipscheck subdirectory

Resolves: rhbz#1980758
---
 gmp.spec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gmp.spec b/gmp.spec
index 71ebd97..0d8e01f 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -6,7 +6,7 @@
 Summary: A GNU arbitrary precision library
 Name: gmp
 Version: 6.2.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 URL: http://gmplib.org/
 Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}.tar.bz2
@@ -104,8 +104,11 @@ export LD_LIBRARY_PATH=`pwd`/.libs
     %{__os_install_post} \
     fipshmac -d $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/libgmp.so.10.* \
     file=`basename $RPM_BUILD_ROOT%{_libdir}/libgmp.so.10.*.hmac` && \
-        mv $RPM_BUILD_ROOT%{_libdir}/$file $RPM_BUILD_ROOT%{_libdir}/.$file && \
-        ln -s .$file $RPM_BUILD_ROOT%{_libdir}/.libgmp.so.10.hmac
+	mkdir -p $RPM_BUILD_ROOT%{_libdir}/fipscheck && \
+        mv $RPM_BUILD_ROOT%{_libdir}/$file $RPM_BUILD_ROOT%{_libdir}/fipscheck/$file && \
+        ln -s $file $RPM_BUILD_ROOT%{_libdir}/fipscheck/libgmp.so.10.hmac && \
+        cp $RPM_BUILD_ROOT%{_libdir}/fipscheck/$file $RPM_BUILD_ROOT%{_libdir}/.$file && \
+        ln -s .$file $RPM_BUILD_ROOT%{_libdir}/.libgmp.so.10.hmac 
 %{nil}
 %endif
 
@@ -159,6 +162,7 @@ export LD_LIBRARY_PATH=`pwd`/.libs
 %{_libdir}/libgmp.so.*
 %if %{with fips}
 %{_libdir}/.libgmp.so.*.hmac
+%{_libdir}/fipscheck/libgmp.so.*.hmac
 %endif
 
 %files c++
@@ -177,6 +181,11 @@ export LD_LIBRARY_PATH=`pwd`/.libs
 %{_libdir}/libgmpxx.a
 
 %changelog
+* Wed Aug 18 2021 Jakub Martisko <jamartis@redhat.com> - 1:6.2.0-9
+- Move the .hmac files to the fipscheck subfolder
+- Make symlinks from their original location (Fedora contains the .hmac files there) pointing to their new location
+Resolves: rhbz#1980758
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:6.2.0-8
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688