Hello community, here is the log from the commit of package apache-rpm-macros for openSUSE:Factory checked in at 2014-11-05 15:55:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes 2014-11-03 13:13:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 2014-11-05 15:55:19.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 4 14:43:18 UTC 2014 - [email protected] + +- add %{apache_datadir} macro + +------------------------------------------------------------------- +Mon Nov 3 07:23:01 UTC 2014 - [email protected] + +- fix %{apache_apxs} macro + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.yK0Syo/_old 2014-11-05 15:55:21.000000000 +0100 +++ /var/tmp/diff_new_pack.yK0Syo/_new 2014-11-05 15:55:21.000000000 +0100 @@ -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,13 @@ %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 +%else +%define macros_dir %{_sysconfdir}/rpm +%endif %define macros_file macros.apache Name: apache-rpm-macros Version: 20141017 @@ -61,6 +67,7 @@ %%apache_mmn %{ap_mmn} %%apache_serverroot %{ap_serverroot} %%apache_sysconfdir %{ap_sysconfdir} +%%apache_datadir %{ap_datadir} eom %install -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
