From b046d129b33a65339befb20f064f6a4884147d8b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 13 Jul 2020 19:36:28 +0000 Subject: [PATCH] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- gimp.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gimp.spec b/gimp.spec index f4948fd..145a658 100644 --- a/gimp.spec +++ b/gimp.spec @@ -89,7 +89,7 @@ Name: gimp Epoch: 2 Version: 2.10.20 %global rel 2 -Release: %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist} +Release: %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist}.1 # Compute some version related macros. # Ugly, need to get quoting percent signs straight. @@ -395,7 +395,7 @@ export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 %endif --without-appdata-test -make %{?_smp_mflags} +%make_build %if ! %{unstable} # Generate RPM macros from pkg-config data: @@ -444,7 +444,7 @@ EOF %endif %install -make DESTDIR=%{buildroot} install +%make_install %if ! %unstable install -D -m0644 macros.gimp %{buildroot}%{_rpmconfigdir}/macros.d/macros.gimp %endif @@ -718,6 +718,10 @@ make check %{?_smp_mflags} %endif %changelog +* Mon Jul 13 2020 Tom Stellard - 2:2.10.20-2.1 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Wed Jun 24 2020 Josef Ridky - 2:2.10.20-2 - fix issue with liblcms2 in rawhide (#1850141)