From 49712c8b6c902a5a87a69fc6efabc9719523e459 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 20:46:40 +0000 Subject: [PATCH] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- libzmf.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libzmf.spec b/libzmf.spec index a162494..1b4ad4b 100644 --- a/libzmf.spec +++ b/libzmf.spec @@ -2,7 +2,7 @@ Name: libzmf Version: 0.0.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A library for import of Zoner document formats License: MPLv2.0 @@ -58,10 +58,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 # we install API docs directly from build rm -rf %{buildroot}/%{_docdir}/%{name} @@ -78,7 +78,7 @@ install -m 0644 zmf2*.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 NEWS @@ -102,6 +102,10 @@ make %{?_smp_mflags} check %{_mandir}/man1/zmf2svg.1* %changelog +* Tue Jul 14 2020 Tom Stellard - 0.0.2-14 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Sat May 16 2020 Pete Walter - 0.0.2-13 - Rebuild for ICU 67