diff --git a/apache-rpm-macros.changes b/apache-rpm-macros.changes index 654c0a7..18de9eb 100644 --- a/apache-rpm-macros.changes +++ b/apache-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 15 09:13:18 UTC 2015 - pgajdos@suse.com + +- version 20150915 +- new macro: %apache_access_syntax_version + ------------------------------------------------------------------- Sat Sep 5 07:22:53 UTC 2015 - pgajdos@suse.com diff --git a/apache-rpm-macros.spec b/apache-rpm-macros.spec index fdc6c86..497f90b 100644 --- a/apache-rpm-macros.spec +++ b/apache-rpm-macros.spec @@ -20,21 +20,22 @@ %define _libexecdir /usr/lib %endif -%define ap_major 2 -%define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | sed "s:\\(\\..*\\)\\..*:\\1:") -%define ap_pname apache%{ap_major} -%define ap_apxs %(rpm -ql apache%{ap_major}-devel | grep 'apxs[2]\\?$' | head -n 1) -%define ap_cflags %(%{ap_apxs} -q CFLAGS) -%define ap_includedir %(%{ap_apxs} -q INCLUDEDIR) -%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 %(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) -%define ap_user wwwrun -%define ap_group www +%define ap_major 2 +%define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | sed "s:\\(\\..*\\)\\..*:\\1:") +%define ap_pname apache%{ap_major} +%define ap_apxs %(rpm -ql apache%{ap_major}-devel | grep 'apxs[2]\\?$' | head -n 1) +%define ap_cflags %(%{ap_apxs} -q CFLAGS) +%define ap_includedir %(%{ap_apxs} -q INCLUDEDIR) +%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 %(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) +%define ap_user wwwrun +%define ap_group www +%define ap_access_syntax_version %(if [ $(grep -c '^[[:space:]]*Require all denied' /etc/apache2/httpd.conf) -gt 0 ]; then echo 24; else echo 22; fi) # %if 0%{?suse_version} > 1230 %define macros_dir %{_libexecdir}/rpm/macros.d @@ -43,7 +44,7 @@ %endif %define macros_file macros.apache Name: apache-rpm-macros -Version: 20150904 +Version: 20150915 Release: 0 Summary: Apache RPM Macros License: Apache-2.0 @@ -75,6 +76,7 @@ cat << eom > %{macros_file} %%apache_datadir %{ap_datadir} %%apache_user %{ap_user} %%apache_group %{ap_group} +%%apache_access_syntax_version %{ap_access_syntax_version} eom echo >> %{macros_file} cat %{SOURCE1} >> %{macros_file}