From 419ea5543ac432fc594b1fd3eaceb3b03fd12f5c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 13 Jul 2020 20:14:50 +0000 Subject: [PATCH] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- icu.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/icu.spec b/icu.spec index 2583da6..226c909 100644 --- a/icu.spec +++ b/icu.spec @@ -2,7 +2,7 @@ Name: icu Version: 67.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: International Components for Unicode License: MIT and UCD and Public Domain @@ -90,13 +90,13 @@ test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepen # more verbosity for build.log sed -i -r 's|(PKGDATA_OPTS = )|\1-v |' data/Makefile -make %{?_smp_mflags} VERBOSE=1 -make %{?_smp_mflags} doc +%make_build +%make_build doc %install rm -rf $RPM_BUILD_ROOT source/__docs -make %{?_smp_mflags} -C source install DESTDIR=$RPM_BUILD_ROOT +%make_install %{?_smp_mflags} -C source make %{?_smp_mflags} -C source install-doc docdir=__docs chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.* ( @@ -113,9 +113,9 @@ if grep -q @VERSION@ source/tools/*/*.8 source/tools/*/*.1 source/config/*.1; th fi %ifarch i686 # F26 since the mass rebuild in 2017-Feb fails a check, ignore error. TODO: find cause / disable only one. -make %{?_smp_mflags} -C source check ||: +%make_build -C source check ||: %else -make %{?_smp_mflags} -C source check +%make_build -C source check %endif # log available codes @@ -179,6 +179,10 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %changelog +* Mon Jul 13 2020 Tom Stellard - 67.1-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Fri May 15 2020 Pete Walter - 67.1-1 - Update to 67.1