Dominique Leuenberger 2014-11-13 08:17:28 +00:00 committed by Git OBS Bridge
commit f5bb00795e
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 11 09:58:44 UTC 2014 - pgajdos@suse.com
- new macros: %{apache_user}, %{apache_group} [bnc#904409]
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 4 14:43:18 UTC 2014 - pgajdos@suse.com Tue Nov 4 14:43:18 UTC 2014 - pgajdos@suse.com

View File

@ -31,6 +31,8 @@
%define ap_serverroot %(%{ap_apxs} -q PREFIX) %define ap_serverroot %(%{ap_apxs} -q PREFIX)
%define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR) %define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR)
%define ap_datadir %(%{ap_apxs} -q DATADIR) %define ap_datadir %(%{ap_apxs} -q DATADIR)
%define ap_user wwwrun
%define ap_group www
# #
%if 0%{?suse_version} > 1230 %if 0%{?suse_version} > 1230
%define macros_dir %{_libexecdir}/rpm/macros.d %define macros_dir %{_libexecdir}/rpm/macros.d
@ -39,7 +41,7 @@
%endif %endif
%define macros_file macros.apache %define macros_file macros.apache
Name: apache-rpm-macros Name: apache-rpm-macros
Version: 20141017 Version: 20141111
Release: 0 Release: 0
Summary: Apache RPM Macros Summary: Apache RPM Macros
License: Apache-2.0 License: Apache-2.0
@ -68,6 +70,8 @@ cat << eom > %{macros_file}
%%apache_serverroot %{ap_serverroot} %%apache_serverroot %{ap_serverroot}
%%apache_sysconfdir %{ap_sysconfdir} %%apache_sysconfdir %{ap_sysconfdir}
%%apache_datadir %{ap_datadir} %%apache_datadir %{ap_datadir}
%%apache_user %{ap_user}
%%apache_group %{ap_group}
eom eom
%install %install