From 2ef12c9266c74bcd6807715c5c61b873167b1daf Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Tue, 13 Mar 2012 16:52:36 +0000
Subject: [PATCH] fix symlink for poweredby.png

---
 00-base.conf | 4 ++--
 httpd.spec   | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/00-base.conf b/00-base.conf
index 7a89d63..32d9567 100644
--- a/00-base.conf
+++ b/00-base.conf
@@ -39,12 +39,10 @@ LoadModule headers_module modules/mod_headers.so
 LoadModule include_module modules/mod_include.so
 LoadModule info_module modules/mod_info.so
 LoadModule log_config_module modules/mod_log_config.so
-LoadModule log_debug_module modules/mod_log_debug.so
 LoadModule logio_module modules/mod_logio.so
 LoadModule mime_magic_module modules/mod_mime_magic.so
 LoadModule mime_module modules/mod_mime.so
 LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule ratelimit_module modules/mod_ratelimit.so
 LoadModule remoteip_module modules/mod_remoteip.so
 LoadModule reqtimeout_module modules/mod_reqtimeout.so
 LoadModule rewrite_module modules/mod_rewrite.so
@@ -71,6 +69,8 @@ LoadModule vhost_alias_module modules/mod_vhost_alias.so
 #LoadModule usertrack_module modules/mod_usertrack.so
 #LoadModule dialup_module modules/mod_dialup.so
 #LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
 #LoadModule reflector_module modules/mod_reflector.so
 #LoadModule request_module modules/mod_request.so
 #LoadModule sed_module modules/mod_sed.so
diff --git a/httpd.spec b/httpd.spec
index 0f23fad..5b21c23 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.1
-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
@@ -312,7 +312,7 @@ rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html \
       $RPM_BUILD_ROOT%{docroot}/cgi-bin/*
 
 # Symlink for the powered-by-$DISTRO image:
-ln -s ../../..%{_datadir}/pixmaps/poweredby.png \
+ln -s ../../pixmaps/poweredby.png \
         $RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
 
 # symlinks for /etc/httpd
@@ -552,6 +552,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-4
+- fix symlink for poweredby.png
+
 * Tue Mar 13 2012 Joe Orton <jorton@redhat.com> - 2.4.1-3
 - add mod_proxy_html subpackage (w/mod_proxy_html + mod_xml2enc)
 - move mod_ldap, mod_authnz_ldap to mod_ldap subpackage