From ea1375ef9c59148819f83addad56a381283909b0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 1 Aug 2019 15:52:40 -0600 Subject: [PATCH] Modernize spec --- libyubikey.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libyubikey.spec b/libyubikey.spec index 4fea13c..5d77500 100644 --- a/libyubikey.spec +++ b/libyubikey.spec @@ -1,6 +1,6 @@ Name: libyubikey Version: 1.13 -Release: 10%{?dist} +Release: 11%{?dist} Summary: C library for decrypting and parsing Yubikey One-time passwords License: BSD @@ -14,7 +14,7 @@ authentication device, the Yubikey. %package devel Summary: Development files for libyubikey -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains the header file needed to develop applications that use @@ -26,17 +26,16 @@ libyubikey. %build %configure --disable-static --disable-silent-rules # --disable-rpath doesn't work for the configure script -%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -%{__make} %{?_smp_mflags} +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%make_build %check export LD_LIBRARY_PATH=${RPM_BUILD_DIR}/%{name}-%{version}/.libs -%{__make} check +make check %install -%{__rm} -rf $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" +%make_install INSTALL="install -p" %ldconfig_scriptlets @@ -58,6 +57,9 @@ export LD_LIBRARY_PATH=${RPM_BUILD_DIR}/%{name}-%{version}/.libs %exclude %{_libdir}/libyubikey.la %changelog +* Thu Aug 1 2019 Orion Poplawski - 1.13-11 +- Modernize spec + * Thu Jul 25 2019 Fedora Release Engineering - 1.13-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild