From 4bb064639cd806f2c6eb4096d05232c6042deb47496c05ee9248f5c2bcf903ba Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Mon, 3 Nov 2014 13:28:31 +0000 Subject: [PATCH 1/2] Accepting request 259504 from home:pgajdos:apache2 - fix %{apache_apxs} macro OBS-URL: https://build.opensuse.org/request/show/259504 OBS-URL: https://build.opensuse.org/package/show/Apache/apache-rpm-macros?expand=0&rev=5 --- apache-rpm-macros.changes | 5 +++++ apache-rpm-macros.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apache-rpm-macros.changes b/apache-rpm-macros.changes index 91a76d2..be4c26e 100644 --- a/apache-rpm-macros.changes +++ b/apache-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/apache-rpm-macros.spec b/apache-rpm-macros.spec index 76e399f..30a3456 100644 --- a/apache-rpm-macros.spec +++ b/apache-rpm-macros.spec @@ -22,7 +22,7 @@ %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 %{_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_includedir %(%{ap_apxs} -q INCLUDEDIR) %define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR) @@ -30,7 +30,12 @@ %define ap_mmn %(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) %define ap_serverroot %(%{ap_apxs} -q PREFIX) %define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR) +# +%if 0%{?suse_version} > 1230 %define macros_dir %{_libexecdir}/rpm/macros.d +%else +%define macros_dir %{_sysconfdir}/rpm +%endif %define macros_file macros.apache Name: apache-rpm-macros Version: 20141017 From 7db52769748bbc49be32947aced630d919d883376788f5243fc74e0f00edcd21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 4 Nov 2014 14:44:46 +0000 Subject: [PATCH 2/2] Accepting request 259658 from home:pgajdos:apache2 - 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 --- apache-rpm-macros.changes | 5 +++++ apache-rpm-macros.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/apache-rpm-macros.changes b/apache-rpm-macros.changes index be4c26e..fd71bb1 100644 --- a/apache-rpm-macros.changes +++ b/apache-rpm-macros.changes @@ -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 diff --git a/apache-rpm-macros.spec b/apache-rpm-macros.spec index 30a3456..13da172 100644 --- a/apache-rpm-macros.spec +++ b/apache-rpm-macros.spec @@ -30,6 +30,7 @@ %define ap_mmn %(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) %define ap_serverroot %(%{ap_apxs} -q PREFIX) %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 @@ -66,6 +67,7 @@ cat << eom > %{macros_file} %%apache_mmn %{ap_mmn} %%apache_serverroot %{ap_serverroot} %%apache_sysconfdir %{ap_sysconfdir} +%%apache_datadir %{ap_datadir} eom %install