From e19d3a5392f82358dcd10e9fdb9f85c4d1b86b032c35c16ef032183c8ccd990e Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Tue, 14 Jul 2015 09:02:49 +0000 Subject: [PATCH] Accepting request 316416 from home:pgajdos - new macro: %{apache_suse_maintenance_mmn} [bnc#915666] (internal) OBS-URL: https://build.opensuse.org/request/show/316416 OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=10 --- apache-rpm-macros.changes | 5 +++++ apache-rpm-macros.spec | 33 ++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/apache-rpm-macros.changes b/apache-rpm-macros.changes index 5457fe8..b9fe1bf 100644 --- a/apache-rpm-macros.changes +++ b/apache-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 13 11:50:52 UTC 2015 - pgajdos@suse.com + +- new macro: %{apache_suse_maintenance_mmn} [bnc#915666] (internal) + ------------------------------------------------------------------- Tue Nov 11 09:58:44 UTC 2014 - pgajdos@suse.com diff --git a/apache-rpm-macros.spec b/apache-rpm-macros.spec index ef61d02..9269f36 100644 --- a/apache-rpm-macros.spec +++ b/apache-rpm-macros.spec @@ -1,7 +1,7 @@ # # spec file for package apache-rpm-macros # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{?suse_version} < 1130 %define _libexecdir /usr/lib %endif @@ -28,6 +29,7 @@ %define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR) %define ap_localstatedir %(%{ap_apxs} -q LOCALSTATEDIR) %define ap_mmn %(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) +%define ap_maint_mmn %(rpm -q --provides apache2 | grep suse_maintenance_mmn) %define ap_serverroot %(%{ap_apxs} -q PREFIX) %define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR) %define ap_datadir %(%{ap_apxs} -q DATADIR) @@ -58,20 +60,21 @@ RPM Macros intended for Apache modules spec files. %build cat << eom > %{macros_file} -%%apache_major %{ap_major} -%%apache_branch %{ap_branch} -%%apache_pname %{ap_pname} -%%apache_apxs %{ap_apxs} -%%apache_cflags %{ap_cflags} -%%apache_includedir %{ap_includedir} -%%apache_libexecdir %{ap_libexecdir} -%%apache_localstatedir %{ap_localstatedir} -%%apache_mmn %{ap_mmn} -%%apache_serverroot %{ap_serverroot} -%%apache_sysconfdir %{ap_sysconfdir} -%%apache_datadir %{ap_datadir} -%%apache_user %{ap_user} -%%apache_group %{ap_group} +%%apache_major %{ap_major} +%%apache_branch %{ap_branch} +%%apache_pname %{ap_pname} +%%apache_apxs %{ap_apxs} +%%apache_cflags %{ap_cflags} +%%apache_includedir %{ap_includedir} +%%apache_libexecdir %{ap_libexecdir} +%%apache_localstatedir %{ap_localstatedir} +%%apache_mmn %{ap_mmn} +%%apache_suse_maintenance_mmn %{ap_maint_mmn} +%%apache_serverroot %{ap_serverroot} +%%apache_sysconfdir %{ap_sysconfdir} +%%apache_datadir %{ap_datadir} +%%apache_user %{ap_user} +%%apache_group %{ap_group} eom %install