Accepting request 340929 from home:pgajdos

- do not build mod_http2 for older distros than 13.2 for now (nghttp2 
  does not build there)

- Include directives really into /etc/apache2/sysconfig.d/include.conf,
  fix from Erik Wegner [bsc#951901]

OBS-URL: https://build.opensuse.org/request/show/340929
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=463

apache2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 26 09:34:28 UTC 2015 - pgajdos@suse.com
+
+- do not build mod_http2 for older distros than 13.2 for now (nghttp2 
+  does not build there)
+
+-------------------------------------------------------------------
+Mon Oct 26 09:14:29 UTC 2015 - pgajdos@suse.com
+
+- Include directives really into /etc/apache2/sysconfig.d/include.conf,
+  fix from Erik Wegner [bsc#951901]
+
 -------------------------------------------------------------------
 Wed Oct 21 07:35:30 UTC 2015 - pgajdos@suse.com
 

apache2.spec

@@ -167,7 +167,9 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(systemd)
 %endif
+%if 0%{?suse_version} >= 1320
 BuildRequires:  pkgconfig(libnghttp2) >= 1.0.0
+%endif
 
 %description
 This version of httpd is a major release of the 2.4 stable branch,
@@ -874,7 +876,9 @@ mv %{buildroot}/%{sysconfdir}/original .
 %{_libdir}/%{name}-prefork/mod_filter.so
 %{_libdir}/%{name}-prefork/mod_headers.so
 %{_libdir}/%{name}-prefork/mod_heartmonitor.so
+%if 0%{?suse_version} >= 1320
 %{_libdir}/%{name}-prefork/mod_http2.so
+%endif
 %{_libdir}/%{name}-prefork/mod_imagemap.so
 %{_libdir}/%{name}-prefork/mod_include.so
 %{_libdir}/%{name}-prefork/mod_info.so
@@ -995,7 +999,9 @@ mv %{buildroot}/%{sysconfdir}/original .
 %{_libdir}/%{name}-worker/mod_filter.so
 %{_libdir}/%{name}-worker/mod_headers.so
 %{_libdir}/%{name}-worker/mod_heartmonitor.so
+%if 0%{?suse_version} >= 1320
 %{_libdir}/%{name}-worker/mod_http2.so
+%endif
 %{_libdir}/%{name}-worker/mod_imagemap.so
 %{_libdir}/%{name}-worker/mod_include.so
 %{_libdir}/%{name}-worker/mod_info.so
@@ -1115,7 +1121,9 @@ mv %{buildroot}/%{sysconfdir}/original .
 %{_libdir}/%{name}-event/mod_file_cache.so
 %{_libdir}/%{name}-event/mod_filter.so
 %{_libdir}/%{name}-event/mod_headers.so
+%if 0%{?suse_version} >= 1320
 %{_libdir}/%{name}-event/mod_http2.so
+%endif
 %{_libdir}/%{name}-event/mod_heartmonitor.so
 %{_libdir}/%{name}-event/mod_imagemap.so
 %{_libdir}/%{name}-event/mod_include.so

start_apache2

@@ -95,11 +95,19 @@ if [ -n "$APACHE_ACCESS_LOG" ]; then
 fi
 # APACHE_CONF_INCLUDE_FILES -> include.conf
 for file in $APACHE_CONF_INCLUDE_FILES; do
-    echo "Include $file" >> include.conf
+    test ${file:0:1} = / || file=/etc/apache2/$file
+    if [ ! -e $file ]; then
+      continue
+    fi
+    echo "Include $file" >> ${sysconfd_dir}/include.conf
 done
 # APACHE_CONF_INCLUDE_DIRS -> include.conf
 for dir in $APACHE_CONF_INCLUDE_DIRS; do
-    echo "Include $dir" >> include.conf
+    test ${dir:0:1} = / || dir=/etc/apache2/$dir
+    if [ ! -e $dir ]; then
+      continue
+    fi
+    echo "Include $dir" >> ${sysconfd_dir}/include.conf
 done
 # APACHE_SERVERADMIN -> global.conf
 if [ -n "$APACHE_SERVERADMIN" ]; then