From 7628b892edf7614001943aa63fbc820dbac82011 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Jul 31 2014 11:05:29 +0000
Subject: expand variables in docdir example configs


---

diff --git a/httpd.spec b/httpd.spec
index cda5cbd..f6d75ca 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -319,6 +319,15 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \
          $RPM_BUILD_ROOT/run/httpd/htcacheclean
 
+# Substitute in defaults which are usually done (badly) by "make install"
+sed -i \
+   "s,@@ServerRoot@@/var,%{_localstatedir}/lib/dav,;
+    s,@@ServerRoot@@/user.passwd,/etc/httpd/conf/user.passwd,;
+    s,@@ServerRoot@@/docs,%{docroot},;
+    s,@@ServerRoot@@,%{docroot},;
+    s,@@Port@@,80,;" \
+    docs/conf/extra/*.conf
+
 # Create cache directory
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
          $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
@@ -616,6 +625,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Jul 21 2014 Joe Orton <jorton@redhat.com> - 2.4.10-1
 - update to 2.4.10
+- expand variables in docdir example configs
 
 * Wed Apr 09 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.9-1
 - update to 2.4.9