diff --git a/apache2.spec b/apache2.spec index 7c0d166..1e6ed8c 100644 --- a/apache2.spec +++ b/apache2.spec @@ -266,8 +266,8 @@ for development using the Apache API. %package doc Summary: Additional Package Documentation -Group: Documentation/Other # Remove after 13.2 is out of support scope +Group: Documentation/Other Provides: apache-doc = %{version} Obsoletes: apache-doc < %{version} %if 0%{?suse_version} >= 1120 @@ -280,8 +280,8 @@ this package's base documentation. %package example-pages Summary: Example Pages for the Apache 2 Web Server -Group: Productivity/Networking/Web/Servers # Remove after 13.2 is out of support scope +Group: Productivity/Networking/Web/Servers Provides: apache-example-pages Obsoletes: apache-example-pages diff --git a/httpd-2.4.3-mod_systemd.patch b/httpd-2.4.3-mod_systemd.patch index db02def..c030e43 100644 --- a/httpd-2.4.3-mod_systemd.patch +++ b/httpd-2.4.3-mod_systemd.patch @@ -1,20 +1,31 @@ ---- httpd-2.4.11.orig/modules/arch/unix/config5.m4 -+++ httpd-2.4.11/modules/arch/unix/config5.m4 -@@ -18,6 +18,12 @@ APACHE_MODULE(privileges, Per-virtualhos +Index: httpd-2.4.23/modules/arch/unix/config5.m4 +=================================================================== +--- httpd-2.4.23.orig/modules/arch/unix/config5.m4 2016-12-09 12:29:49.398598223 +0100 ++++ httpd-2.4.23/modules/arch/unix/config5.m4 2016-12-09 13:00:35.429783217 +0100 +@@ -18,6 +18,19 @@ APACHE_MODULE(privileges, Per-virtualhos fi ]) + +APACHE_MODULE(systemd, Systemd support, , , $unixd_mods_enabled, [ -+ PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) ++ PKG_CHECK_MODULES([SYSTEMD], ++ [libsystemd >= 209], ++ [have_systemd=yes], ++ [PKG_CHECK_MODULES([SYSTEMD], ++ [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32], ++ [have_systemd=yes], ++ [have_systemd=no])]) + APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS]) +]) ++ + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) APACHE_MODPATH_FINISH ---- /dev/null -+++ httpd-2.4.11/modules/arch/unix/mod_systemd.c +Index: httpd-2.4.23/modules/arch/unix/mod_systemd.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ httpd-2.4.23/modules/arch/unix/mod_systemd.c 2016-12-09 12:30:21.935147438 +0100 @@ -0,0 +1,138 @@ +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with @@ -154,8 +165,10 @@ + NULL, + systemd_register_hooks, +}; ---- httpd-2.4.11.orig/configure.in -+++ httpd-2.4.11/configure.in +Index: httpd-2.4.23/configure.in +=================================================================== +--- httpd-2.4.23.orig/configure.in 2016-12-09 12:29:49.398598223 +0100 ++++ httpd-2.4.23/configure.in 2016-12-09 12:30:21.939147506 +0100 @@ -77,6 +77,7 @@ dnl shared library support for these pac dnl work on some platforms