From aedd5df04a789edce20df18b4e4eab66c5b8e07a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 16:28:35 +0000 Subject: [PATCH] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- libcdr.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libcdr.spec b/libcdr.spec index 331ba36..28f811e 100644 --- a/libcdr.spec +++ b/libcdr.spec @@ -2,7 +2,7 @@ Name: libcdr Version: 0.1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for import of CorelDRAW drawings # the only Public Domain source is src/lib/CDRColorProfiles.h @@ -59,10 +59,10 @@ sed -i \ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ libtool -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install rm -f %{buildroot}/%{_libdir}/*.la # rhbz#1001251 we install API docs directly from build rm -rf %{buildroot}/%{_docdir}/%{name} @@ -79,7 +79,7 @@ install -m 0644 cdr2*.1 cmx2*.1 %{buildroot}/%{_mandir}/man1 %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make %{?_smp_mflags} check +%make_build check %files %doc AUTHORS ChangeLog README @@ -111,6 +111,10 @@ make %{?_smp_mflags} check %{_mandir}/man1/cmx2xhtml.1* %changelog +* Tue Jul 14 2020 Tom Stellard - 0.1.6-3 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Sat May 16 2020 Pete Walter - 0.1.6-2 - Rebuild for ICU 67