From 29d590ca307118f394a4e5c6999d685398a353d86e860f38ab7b9d128989543d Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 26 Nov 2020 13:39:52 +0000 Subject: [PATCH 1/2] Accepting request 851078 from home:pgajdos - version update to 20201124 * change location of apache2_MMN OBS-URL: https://build.opensuse.org/request/show/851078 OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=37 --- apache-rpm-macros.changes | 6 ++++++ apache-rpm-macros.spec | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apache-rpm-macros.changes b/apache-rpm-macros.changes index 04ae11e..4f82fd9 100644 --- a/apache-rpm-macros.changes +++ b/apache-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 26 13:36:53 UTC 2020 - pgajdos@suse.com + +- version update to 20201124 + * change location of apache2_MMN + ------------------------------------------------------------------- Tue Feb 11 09:12:20 UTC 2020 - pgajdos@suse.com diff --git a/apache-rpm-macros.spec b/apache-rpm-macros.spec index bdf922c..8fa0cf8 100644 --- a/apache-rpm-macros.spec +++ b/apache-rpm-macros.spec @@ -16,10 +16,6 @@ # -%if 0%{?suse_version} < 1130 -%define _libexecdir /usr/lib -%endif - %define ap_major 2 %if 0%{?suse_version} %define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; }) @@ -35,7 +31,7 @@ %define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR) %define ap_localstatedir %(%{ap_apxs} -q LOCALSTATEDIR) %if 0%{?suse_version} -%define ap_mmn %(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) +%define ap_mmn %(%{_libexecdir}/apache2_MMN) %define ap_maint_mmn %(MMN=$(rpm -q --provides apache2 | grep suse_maintenance_mmn); test -z "$MMN" && MMN=apache2; echo $MMN) %endif %define ap_serverroot %(%{ap_apxs} -q PREFIX) @@ -59,7 +55,7 @@ %endif %define macros_file macros.apache Name: apache-rpm-macros -Version: 20200211 +Version: 20201124 Release: 0 Summary: Apache RPM Macros License: Apache-2.0 From 4bd357714e2f718b1ca098b4c1552236d38905ffc218e845ac9dfa4c716537c7 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 30 Nov 2020 08:56:45 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=38 --- apache-rpm-macros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-rpm-macros.spec b/apache-rpm-macros.spec index 8fa0cf8..8daaeb3 100644 --- a/apache-rpm-macros.spec +++ b/apache-rpm-macros.spec @@ -31,7 +31,7 @@ %define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR) %define ap_localstatedir %(%{ap_apxs} -q LOCALSTATEDIR) %if 0%{?suse_version} -%define ap_mmn %(%{_libexecdir}/apache2_MMN) +%define ap_mmn %(%{_libexecdir}/apache2_MMN 2>/dev/null || %{_libdir}/apache2_MMN 2>/dev/null) %define ap_maint_mmn %(MMN=$(rpm -q --provides apache2 | grep suse_maintenance_mmn); test -z "$MMN" && MMN=apache2; echo $MMN) %endif %define ap_serverroot %(%{ap_apxs} -q PREFIX)