Hello community, here is the log from the commit of package apache-rpm-macros for openSUSE:Factory checked in at 2016-02-16 09:27:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-01-23 01:03:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 2016-02-16 09:27:28.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Jan 20 18:33:51 UTC 2016 - [email protected] + +- version 20161120 +- %apache_test_module_start_apache: detect if module is built in + statically before attempt to search for it in filesystem + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.D6gfYY/_old 2016-02-16 09:27:29.000000000 +0100 +++ /var/tmp/diff_new_pack.D6gfYY/_new 2016-02-16 09:27:29.000000000 +0100 @@ -59,7 +59,7 @@ %endif %define macros_file macros.apache Name: apache-rpm-macros -Version: 20160111 +Version: 20160120 Release: 0 Summary: Apache RPM Macros License: Apache-2.0 ++++++ macros.apache-module-test ++++++ --- /var/tmp/diff_new_pack.D6gfYY/_old 2016-02-16 09:27:29.000000000 +0100 +++ /var/tmp/diff_new_pack.D6gfYY/_new 2016-02-16 09:27:29.000000000 +0100 @@ -70,7 +70,8 @@ if [ -z "$TEST_MPM" ]; then \ TEST_MPM='%{__test_mpm}' \ fi \ - # helpers \ + # apache binary \ + CMD=$(ls %{_sbindir}/httpd*-$TEST_MPM | head -n 1) \ # begin \ echo "-----------------------------------------------------------" \ echo "APACHE MODULE TEST" \ @@ -97,6 +98,8 @@ fi \ echo "LoadModule authz_host_module $SYSTEM_MODULE_PATH/mod_authz_host.so" >> $TEST_CONF_FILE \ for m in $(echo $MODULES | tr ':' ' '); do \ + # if module is compiled in statically, do not load \ + $CMD -f $TEST_CONF_FILE -M | grep $m && continue \ module_path=$(find %{buildroot} %{apache_libexecdir}-$TEST_MPM %{apache_libexecdir} -name "mod_$m.so" | tail -n 1) \ if [ -z "$module_path" ]; then \ echo "ERROR: Module $m not found." \ @@ -124,7 +127,6 @@ echo "DocumentRoot $DOCUMENT_ROOT" >> $TEST_CONF_FILE \ echo "DirectoryIndex index.html" >> $TEST_CONF_FILE \ # run apache \ - CMD=$(ls %{_sbindir}/httpd*-$TEST_MPM | head -n 1) \ echo -n "Starting Apache ... " \ $CMD -f $TEST_CONF_FILE -k start \ # wait to be sure apache finished start \
