Accepting request 110180 from home:adrianSuSE:branches:Apache

patch seems to be lost, we require it on our OBS installations

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

apache2.spec

@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           apache2
 BuildRequires:  automake
 BuildRequires:  db-devel
@@ -139,6 +138,7 @@ Patch65:        httpd-2.0.49-log_server_status.dif
 Patch66:        httpd-2.0.54-envvars.dif
 Patch67:        httpd-2.2.0-apxs-a2enmod.dif
 Patch68:        httpd-2.x.x-logresolve.patch
+Patch69:        httpd-2.2.x-bnc690734.patch
 Patch100:       apache2.2-mpm-itk-20090414-00.patch
 Patch101:       httpd-2.2.19-linux3.patch
 Patch102:       httpd-keepalivetimeout-millisecs.patch
@@ -152,15 +152,19 @@ Icon:           Apache.xpm
 Summary:        The Apache Web Server Version 2.2
 License:        Apache-2.0
 Group:          Productivity/Networking/Web/Servers
-Provides:       httpd http_daemon %{apache_mmn} suse_help_viewer
-Requires:       %{pname}-MPM /etc/mime.types
+Provides:       %{apache_mmn}
+Provides:       http_daemon
+Provides:       httpd
+Provides:       suse_help_viewer
+Requires:       %{pname}-MPM
+Requires:       /etc/mime.types
 PreReq:         %{name}-utils
 Requires:       logrotate
 # in the past, libapr1 >= 1.0 was sufficient. But since 2.2.16, a failure to
 # create listen sockets can occur, unless newer libapr1 is used, with certain kernels.
 # see https://bugzilla.redhat.com/show_bug.cgi?id=516331
-Requires:       libapr1 >= 1.4.2
 Requires:       libapr1 < 2.0
+Requires:       libapr1 >= 1.4.2
 %{?systemd_requires}
 PreReq:         fileutils textutils grep sed 
 %if %{?suse_version:1}0
@@ -297,9 +301,12 @@ See http://mpm-itk.sesse.net/
 %package devel
 Summary:        Apache 2.2 Header and Include Files
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version} %{pname}-MPM
-Requires:       libapr1-devel libapr-util1-devel
-Requires:       apache2-prefork gcc
+Requires:       %{name} = %{version}
+Requires:       %{pname}-MPM
+Requires:       apache2-prefork
+Requires:       gcc
+Requires:       libapr-util1-devel
+Requires:       libapr1-devel
 
 %description devel
 This package contains header files and include files that are needed
@@ -357,6 +364,7 @@ to administrators of web servers in general.
 %patch66 -p1
 %patch67 -p1
 %patch68 -p1
+%patch69
 %patch100
 %patch101
 %patch102