From d7af1426e969ef55697d4cc94fcb82c4065fe339 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 31 Jan 2017 01:45:38 +0200 Subject: [PATCH] pldize LD_LIBRARY_PATH is pointless for tests in PLD because make tests is run from build, not from install --- libyubikey.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libyubikey.spec b/libyubikey.spec index d1cf5fd..bbbaf3c 100644 --- a/libyubikey.spec +++ b/libyubikey.spec @@ -1,15 +1,16 @@ -%bcond_without tests # +# Conditional build: +%bcond_without tests # build without tests + Summary: C library for decrypting and parsing Yubikey One-time passwords Name: libyubikey Version: 1.13 Release: 1 License: BSD -Group: Development/Libraries Group: Libraries -URL: http://opensource.yubico.com/yubico-c Source0: http://opensource.yubico.com/yubico-c/releases/%{name}-%{version}.tar.gz # Source0-md5: 6e84fc1914ab5b609319945c18d45835 +URL: http://opensource.yubico.com/yubico-c BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -36,22 +37,20 @@ that use libyubikey. %{__make} %if %{with tests} -export LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/.libs %{__make} check %endif %install rm -rf $RPM_BUILD_ROOT - %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - INSTALL="%{__install} -p" + INSTALL="%{__install} -p" \ + DESTDIR=$RPM_BUILD_ROOT %clean -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(644,root,root,755) -- 2.44.0