diff --git a/apr-util.spec b/apr-util.spec index e863eba..02cadf8 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -16,7 +16,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.6.1 -Release: 12%{?dist} +Release: 13%{?dist} License: ASL 2.0 URL: https://apr.apache.org/ Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 @@ -143,11 +143,11 @@ export ac_cv_ldap_set_rebind_proc_style=three %else --without-nss %endif -make %{?_smp_mflags} +%{make_build} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%{make_install} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/aclocal install -m 644 build/find_apu.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal @@ -172,7 +172,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/apr-util-%{apuver}/*.*a # Run the less verbose test suites export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) cd test -make %{?_smp_mflags} testall +%{make_build} testall # testall breaks with DBD DSO; ignore export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver} ./testall -v -q @@ -219,6 +219,10 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver} %{_datadir}/aclocal/*.m4 %changelog +* Mon May 04 2020 Tom Stellard - 1.6.1-13 +- Use make_build and make_install macros +- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make + * Tue Jan 28 2020 Fedora Release Engineering - 1.6.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild