From 825ca613324250911e9474cd6622df66c600e7cf Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 16 Jul 2019 10:43:37 +0200 Subject: [PATCH] Factor out fipshmac as a macro --- nettle.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nettle.spec b/nettle.spec index ccf6186..10397c7 100644 --- a/nettle.spec +++ b/nettle.spec @@ -55,14 +55,18 @@ autoreconf -ifv make %{?_smp_mflags} %if %{with fips} +%define fipshmac() \ + fipshmac -d $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/%1.* \ + file=`basename $RPM_BUILD_ROOT%{_libdir}/%1.*.hmac` && \ + mv $RPM_BUILD_ROOT%{_libdir}/$file $RPM_BUILD_ROOT%{_libdir}/.$file && \ + ln -s .$file $RPM_BUILD_ROOT%{_libdir}/.%1.hmac + %define __spec_install_post \ %{?__debug_package:%{__debug_install_post}} \ %{__arch_install_post} \ %{__os_install_post} \ - fipshmac -d $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/libnettle.so.%{nettle_so_ver}.* \ - fipshmac -d $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/libhogweed.so.%{hogweed_so_ver}.* \ - file=`basename $RPM_BUILD_ROOT%{_libdir}/libnettle.so.%{nettle_so_ver}.*.hmac` && mv $RPM_BUILD_ROOT%{_libdir}/$file $RPM_BUILD_ROOT%{_libdir}/.$file && ln -s .$file $RPM_BUILD_ROOT%{_libdir}/.libnettle.so.%{nettle_so_ver}.hmac \ - file=`basename $RPM_BUILD_ROOT%{_libdir}/libhogweed.so.%{hogweed_so_ver}.*.hmac` && mv $RPM_BUILD_ROOT%{_libdir}/$file $RPM_BUILD_ROOT%{_libdir}/.$file && ln -s .$file $RPM_BUILD_ROOT%{_libdir}/.libhogweed.so.%{hogweed_so_ver}.hmac \ + %fipshmac libnettle.so.%{nettle_so_ver} \ + %fipshmac libhogweed.so.%{hogweed_so_ver} \ %{nil} %endif