From 888fcaf9d46474b59bfde0a1d2b658e4ea27d4b52c39f30de82fdbbb1f6eee45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Tue, 3 Sep 2013 04:07:30 +0000
Subject: [PATCH] Accepting request 197199 from home:elvigia:branches:Apache

- Ensure we only use /run and not /var/run

OBS-URL: https://build.opensuse.org/request/show/197199
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=390
---
 apache2.changes | 5 +++++
 apache2.spec    | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apache2.changes b/apache2.changes
index 88494f8..2961c98 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  3 03:58:27 UTC 2013 - crrodriguez@opensuse.org
+
+- Ensure we only use /run and not /var/run 
+
 -------------------------------------------------------------------
 Fri Aug 30 04:48:07 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/apache2.spec b/apache2.spec
index 52e136c..f0d8665 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -69,7 +69,11 @@ BuildRequires:  expat-devel
 %define localstatedir	/var/lib/%{pname}
 %define proxycachedir 	/var/cache/%{pname}
 %define logfiledir	/var/log/%{pname}
+%if %suse_version > 1220
+%define runtimedir /run
+%else
 %define runtimedir	/var/run
+%endif
 %define sysconfdir	/etc/%{pname}
 %define includedir 	%{_includedir}/%{pname}
 %define libexecdir	%_libdir/%{pname}
@@ -500,10 +504,10 @@ for mpm in %{mpms_to_build}; do
 	configure 
 	sed "s/%{vers}-$mpm//" include/ap_config_auto.h > include/ap_config_auto.h.new
 	mv include/ap_config_auto.h.new include/ap_config_auto.h
+    sed -i -e "s@/var/run@%{runtimedir}@g" include/ap_config_layout.h
 
 	make CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -fPIC \
 		-Wall \
-		-DDEFAULT_PIDLOG='\"%{runtimedir}/%{httpd}.pid\"' \
 		-DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"' " \
 		%{?jobs:-j%jobs}