[httpd/f17] extend _httpd_* macro set per proposed guidelines

[jorton]

commit aa0eb89353414f02c51e9c095cbde1598dcaec97
Author: Joe Orton <jorton at redhat.com>
Date:   Mon Apr 30 10:26:44 2012 +0100

    extend _httpd_* macro set per proposed guidelines
    
    - fix comments in sysconfig file (#771024)

 httpd.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/httpd.spec b/httpd.spec
index 33a7509..586c218 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -9,7 +9,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.22
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -285,7 +285,14 @@ mv $RPM_BUILD_ROOT%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
 # Make the MMN accessible to module packages
 echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-echo "%%_httpd_mmn %{mmnisa}" > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.httpd
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.httpd <<EOF
+%%_httpd_mmn %{mmnisa}
+%%_httpd_apxs %%{_sbindir}/apxs
+%%_httpd_modconfdir %%{_sysconfdir}/httpd/conf.d
+%%_httpd_confdir %%{_sysconfdir}/httpd/conf.d
+%%_httpd_contentdir %{contentdir}
+%%_httpd_moddir %%{_libdir}/httpd/modules
+EOF
 
 # docroot
 mkdir $RPM_BUILD_ROOT%{contentdir}/html
@@ -536,6 +543,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Mon Apr 30 2012 Joe Orton <jorton at redhat.com> - 2.2.22-4
+- extend _httpd_* macro set per proposed guidelines
+- fix comments in sysconfig file (#771024)
+
 * Sat Mar 31 2012 Adam Williamson <awilliam at redhat.com> - 2.2.22-3
 - rebuild against openssl 1.0.0h (previous build was against
   1.0.1, this is not good) RH #808793