diff --git a/apache.spec b/apache.spec index 55ecab2..b8003f5 100644 --- a/apache.spec +++ b/apache.spec @@ -6,7 +6,7 @@ Name: apache Version: 2.4.20 -Release: 1mamba +Release: 3mamba Epoch: 1 Summary: The Apache webserver Group: System/Servers @@ -202,6 +202,7 @@ _EOF --disable-example \ --enable-distcache \ --enable-http=yes \ + --enable-mpms-shared=all \ --with-z=%{_prefix} \ --with-ssl=%{_prefix} \ --with-pcre=%{_prefix} @@ -301,7 +302,7 @@ if [ $1 -eq 1 ]; then fi if [ $1 -ge 1 ]; then - apxs -e -a -n slotmem_shm %{_libdir}/apache/mod_slotmem_shm.so + apxs -e -a -n slotmem_shm %{_libdir}/apache/mod_slotmem_shm.so 2>/dev/null sed -i "s|Include[[:space:]]\(/etc/httpd/httpd\.d/\*\.conf\)|IncludeOptional \1|" %{_sysconfdir}/httpd/httpd.conf systemd-tmpfiles --create httpd.conf systemctl -q daemon-reload @@ -435,6 +436,12 @@ exit 0 %{_libdir}/apache/mod_suexec.so %changelog +* Sat Jun 11 2016 Silvan Calarco 2.4.20-3mamba +- fix update_httpdconf.sh script for 64 bit (/usr/lib64) support + +* Sat May 28 2016 Silvan Calarco 2.4.20-2mamba +- rebuilt with --enable-mpms-shared=all + * Tue Apr 26 2016 Automatic Build System 2.4.20-1mamba - automatic version update by autodist diff --git a/httpd-update_httpdconf.sh b/httpd-update_httpdconf.sh index a65bd7e..0978e15 100644 --- a/httpd-update_httpdconf.sh +++ b/httpd-update_httpdconf.sh @@ -1,11 +1,15 @@ #!/bin/bash # update_httpdconf.sh - updates httpd.conf modules list -# Copyright (c) 2006 by Silvan Calarco +# Copyright (c) 2006-2016 by Silvan Calarco INPUT_CONF=/etc/httpd/httpd.conf.rpmnew OUTPUT_CONF=/etc/httpd/httpd.conf MODULES_PREFIX=/usr -MODULES_APPEND=lib/apache +if [ -d /usr/lib64/apache ]; then + MODULES_APPEND=lib64/apache +else + MODULES_APPEND=lib/apache +fi MODULES_PATH=$MODULES_PREFIX/$MODULES_APPEND cont=0