Accepting request 319138 from Apache:Modules

- this is arch package

- bump version to 20150717

- %{apache_suse_maintenance_mmn} expands to just 'apache2' when
  apache2 does not provide suse_maintenance_mmn_# symbol

OBS-URL: https://build.opensuse.org/request/show/319138
OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=12
This commit is contained in:
Kristyna Streitova 2015-08-03 15:18:39 +00:00 committed by Git OBS Bridge
parent e19d3a5392
commit 819ba6d0b4
2 changed files with 18 additions and 3 deletions

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Jul 28 12:01:08 UTC 2015 - pgajdos@suse.com
- this is arch package
-------------------------------------------------------------------
Mon Jul 27 16:03:19 UTC 2015 - pgajdos@suse.com
- bump version to 20150717
-------------------------------------------------------------------
Fri Jul 17 06:36:39 UTC 2015 - pgajdos@suse.com
- %{apache_suse_maintenance_mmn} expands to just 'apache2' when
apache2 does not provide suse_maintenance_mmn_# symbol
-------------------------------------------------------------------
Mon Jul 13 11:50:52 UTC 2015 - pgajdos@suse.com

View File

@ -29,7 +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_maint_mmn %(MMN=$(rpm -q --provides apache2 | grep suse_maintenance_mmn); test -z "$MMN" && MMN=apache2; echo $MMN)
%define ap_serverroot %(%{ap_apxs} -q PREFIX)
%define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR)
%define ap_datadir %(%{ap_apxs} -q DATADIR)
@ -43,7 +43,7 @@
%endif
%define macros_file macros.apache
Name: apache-rpm-macros
Version: 20141111
Version: 20150717
Release: 0
Summary: Apache RPM Macros
License: Apache-2.0
@ -51,7 +51,6 @@ Group: Productivity/Networking/Web/Servers
Url: http://httpd.apache.org/
BuildRequires: apache%{ap_major}-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
RPM Macros intended for Apache modules spec files.