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

Accepting request 259658 from home:pgajdos:apache2

Browse Source 
- add %{apache_datadir} macro

OBS-URL: https://build.opensuse.org/request/show/259658
OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=6
This commit is contained in:
Tomáš Chvátal 2014-11-04 14:44:46 +00:00 committed by Git OBS Bridge
parent 4bb064639c
commit 7db5276974
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache-rpm-macros.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 4 14:43:18 UTC 2014 - pgajdos@suse.com
- add %{apache_datadir} macro
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 3 07:23:01 UTC 2014 - pgajdos@suse.com Mon Nov 3 07:23:01 UTC 2014 - pgajdos@suse.com

2
apache-rpm-macros.spec
View File

@ -30,6 +30,7 @@
%define ap_mmn %(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) %define ap_mmn %(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN)
%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)
# #
%if 0%{?suse_version} > 1230 %if 0%{?suse_version} > 1230
%define macros_dir %{_libexecdir}/rpm/macros.d %define macros_dir %{_libexecdir}/rpm/macros.d
@ -66,6 +67,7 @@ cat << eom > %{macros_file}
%%apache_mmn %{ap_mmn} %%apache_mmn %{ap_mmn}
%%apache_serverroot %{ap_serverroot} %%apache_serverroot %{ap_serverroot}
%%apache_sysconfdir %{ap_sysconfdir} %%apache_sysconfdir %{ap_sysconfdir}
%%apache_datadir %{ap_datadir}
eom eom
%install %install