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

Accepting request 331625 from home:pgajdos:apache2

Browse Source 
- version 20150915
- new macro: %apache_access_syntax_version

OBS-URL: https://build.opensuse.org/request/show/331625
OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=17
This commit is contained in:
Petr Gajdos 2015-09-17 06:53:56 +00:00 committed by Git OBS Bridge
parent f79d3984ea
commit a74f4d12aa
2 changed files with 24 additions and 16 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 @@
-------------------------------------------------------------------
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

34
apache-rpm-macros.spec
View File

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