pool/apache-rpm-macros
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 851858 from Apache

Browse Source 
- version update to 20201124
  * change location of apache2_MMN

OBS-URL: https://build.opensuse.org/request/show/851858
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-rpm-macros?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2020-12-08 12:22:48 +00:00 committed by Git OBS Bridge
commit 47022e73f3
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache-rpm-macros.changes
View File

@ -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 Tue Feb 11 09:12:20 UTC 2020 - pgajdos@suse.com

8
apache-rpm-macros.spec
View File

@ -16,10 +16,6 @@
# #
%if 0%{?suse_version} < 1130
%define _libexecdir /usr/lib
%endif
%define ap_major 2 %define ap_major 2
%if 0%{?suse_version} %if 0%{?suse_version}
%define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; }) %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_libexecdir %(%{ap_apxs} -q LIBEXECDIR)
%define ap_localstatedir %(%{ap_apxs} -q LOCALSTATEDIR) %define ap_localstatedir %(%{ap_apxs} -q LOCALSTATEDIR)
%if 0%{?suse_version} %if 0%{?suse_version}
%define ap_mmn %(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $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) %define ap_maint_mmn %(MMN=$(rpm -q --provides apache2 | grep suse_maintenance_mmn); test -z "$MMN" && MMN=apache2; echo $MMN)
%endif %endif
%define ap_serverroot %(%{ap_apxs} -q PREFIX) %define ap_serverroot %(%{ap_apxs} -q PREFIX)
@ -59,7 +55,7 @@
%endif %endif
%define macros_file macros.apache %define macros_file macros.apache
Name: apache-rpm-macros Name: apache-rpm-macros
Version: 20200211 Version: 20201124
Release: 0 Release: 0
Summary: Apache RPM Macros Summary: Apache RPM Macros
License: Apache-2.0 License: Apache-2.0