From 5b0a492b0e16808a79f78ae947b88897b2a09b03 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 16:31:18 +0000 Subject: [PATCH] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- libetonyek.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libetonyek.spec b/libetonyek.spec index 4e35e7b..b0b0adb 100644 --- a/libetonyek.spec +++ b/libetonyek.spec @@ -2,7 +2,7 @@ Name: libetonyek Version: 0.1.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A library for import of Apple iWork documents License: MPLv2.0 @@ -63,10 +63,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} @@ -83,7 +83,7 @@ install -m 0644 key2*.1 numbers2*.1 pages2*.1 %{buildroot}/%{_mandir}/man1 %check export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -if ! make %{?_smp_mflags} check; then +if ! %make_build check; then cat src/test/*.log exit 1 fi @@ -124,6 +124,10 @@ fi %{_mandir}/man1/pages2text.1* %changelog +* Tue Jul 14 2020 Tom Stellard - 0.1.9-8 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Thu Jun 04 2020 David Tardon - 0.1.9-7 - fix build with latest boost