diff --git a/libica.changes b/libica.changes index 0942fed..9140a97 100644 --- a/libica.changes +++ b/libica.changes @@ -27,6 +27,8 @@ Wed Nov 14 18:01:37 UTC 2018 - mpost@suse.com - Removed COPYING from %files, since it is no longer in the tarball. - Added Add-non-executable-gnu-stack-markings-in-the-assembl.patch (bsc#1103493). +- Replaced multiple instances of $RPM_BUILD_ROOT with %buildroot + in the spec file. ------------------------------------------------------------------- Wed Apr 18 02:29:29 UTC 2018 - mpost@suse.com diff --git a/libica.spec b/libica.spec index 53b0dd2..f3955fb 100644 --- a/libica.spec +++ b/libica.spec @@ -121,15 +121,15 @@ make clean make %{?_smp_mflags} %install -mkdir -p ${RPM_BUILD_ROOT}/usr/include -make DESTDIR=${RPM_BUILD_ROOT} install -cp -p include/ica_api.h ${RPM_BUILD_ROOT}/usr/include -cp -a SuSE/* ${RPM_BUILD_ROOT} -install -D %{S:5} ${RPM_BUILD_ROOT%}%{_fillupdir}/sysconfig.z90crypt +mkdir -p %{buildroot}/usr/include +make DESTDIR=%{buildroot} install +cp -p include/ica_api.h %{buildroot}/usr/include +cp -a SuSE/* %{buildroot} +install -D %{S:5} %{buildroot}%{_fillupdir}/sysconfig.z90crypt cp -a ${RPM_SOURCE_DIR}/README.SUSE . -rm -f ${RPM_BUILD_ROOT}%{_libdir}/libica.la -rm -f ${RPM_BUILD_ROOT}/usr/share/doc/libica/* -rmdir ${RPM_BUILD_ROOT}/usr/share/doc/libica +rm -f %{buildroot}%{_libdir}/libica.la +rm -f %{buildroot}/usr/share/doc/libica/* +rmdir %{buildroot}/usr/share/doc/libica %post -n libica-tools %{fillup_and_insserv -n boot.z90crypt}