From: Graham Leggett <minfrin@apache.org>
Date: Sun, 7 Dec 2008 18:43:43 +0000 (+0000)
Subject: Make sure the htdocs directory appears in the RPM build.
X-Git-Tag: 2.3.1~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45a2a0601889e63bb5054c3bb0e54b1694358d47;p=thirdparty%2Fapache%2Fhttpd.git

Make sure the htdocs directory appears in the RPM build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724168 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index a6731c70d4b..e7d75c96952 100644
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -227,7 +227,6 @@ install -m644 ./build/rpm/httpd.logrotate \
 
 # Remove unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.exp \
-       $RPM_BUILD_ROOT%{contentdir}/htdocs/* \
        $RPM_BUILD_ROOT%{contentdir}/cgi-bin/* 
 
 %pre
@@ -337,12 +336,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{contentdir}
 %dir %{contentdir}/cgi-bin
+%dir %{contentdir}/htdocs
 %dir %{contentdir}/html
 %dir %{contentdir}/icons
 %dir %{contentdir}/error
 %dir %{contentdir}/error/include
 %{contentdir}/icons/*
 %{contentdir}/error/README
+%{contentdir}/htdocs/index.html
 %config(noreplace) %{contentdir}/error/*.var
 %config(noreplace) %{contentdir}/error/include/*.html