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

Accepting request 259659 from Apache

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/259659
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-rpm-macros?expand=0&rev=2
This commit is contained in:
Stephan Kulow 2014-11-05 14:55:00 +00:00 committed by Git OBS Bridge
commit 5f1a6f3518
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apache-rpm-macros.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
- fix %{apache_apxs} macro
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 31 08:56:11 UTC 2014 - pgajdos@suse.com Fri Oct 31 08:56:11 UTC 2014 - pgajdos@suse.com

9
apache-rpm-macros.spec
View File

@ -22,7 +22,7 @@
%define ap_major 2 %define ap_major 2
%define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | sed "s:\\(\\..*\\)\\..*:\\1:") %define ap_branch %(rpm -q --qf "%%{version}" apache%{ap_major} | sed "s:\\(\\..*\\)\\..*:\\1:")
%define ap_pname apache%{ap_major} %define ap_pname apache%{ap_major}
%define ap_apxs %{_sbindir}/apxs%{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_cflags %(%{ap_apxs} -q CFLAGS)
%define ap_includedir %(%{ap_apxs} -q INCLUDEDIR) %define ap_includedir %(%{ap_apxs} -q INCLUDEDIR)
%define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR) %define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR)
@ -30,7 +30,13 @@
%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
%define macros_dir %{_libexecdir}/rpm/macros.d %define macros_dir %{_libexecdir}/rpm/macros.d
%else
%define macros_dir %{_sysconfdir}/rpm
%endif
%define macros_file macros.apache %define macros_file macros.apache
Name: apache-rpm-macros Name: apache-rpm-macros
Version: 20141017 Version: 20141017
@ -61,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