Stephan Kulow 2015-07-16 15:17:10 +00:00 committed by Git OBS Bridge
commit f2f4cbf55f
2 changed files with 23 additions and 15 deletions

View File

@ -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

View File

@ -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)
@ -67,6 +69,7 @@ cat << eom > %{macros_file}
%%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}