From 3c9b5839cd25098040dda54f479929fa4800174b Mon Sep 17 00:00:00 2001
From: Jim Perrin <jperrin@centos.org>
Date: Jun 17 2014 18:13:29 +0000
Subject: Added centos-noindex.tar.gz

Update welcome.conf aliases for noindex rendering
Update spec for:
 - Change vstring to CentOS
 - Append to Release to show mod
 - Change Source1 to centos-noindex.tar.gz
 - Change powerby.png symlink.
 - update %files for noindex
 - update changelog

---

diff --git a/.httpd.metadata b/.httpd.metadata
index d335a99..51a60dd 100644
--- a/.httpd.metadata
+++ b/.httpd.metadata
@@ -1 +1,2 @@
 16d8ec72535ded65d035122b0d944b0e64eaa2a2 SOURCES/httpd-2.4.6.tar.bz2
+acf5cccf4afaecf3afeb18c50ae59fd5c6504910  SOURCES/centos-noindex.tar.gz
diff --git a/SOURCES/welcome.conf b/SOURCES/welcome.conf
index 5d1e452..5897cad 100644
--- a/SOURCES/welcome.conf
+++ b/SOURCES/welcome.conf
@@ -16,3 +16,7 @@
 </Directory>
 
 Alias /.noindex.html /usr/share/httpd/noindex/index.html
+Alias /css/bootstrap.min.css /usr/share/httpd/noindex/css/bootstrap.min.css
+Alias /css/open-sans.css /usr/share/httpd/noindex/css/open-sans.css
+Alias /images/apache_pb.gif /usr/share/httpd/noindex/images/apache_pb.gif
+Alias /images/poweredby.png /usr/share/httpd/noindex/images/poweredby.png
diff --git a/SPECS/httpd.spec b/SPECS/httpd.spec
index 6fd7f3b..9c78374 100644
--- a/SPECS/httpd.spec
+++ b/SPECS/httpd.spec
@@ -4,7 +4,7 @@
 %define mmn 20120211
 %define oldmmnisa %{mmn}-%{__isa_name}-%{__isa_bits}
 %define mmnisa %{mmn}%{__isa_name}%{__isa_bits}
-%define vstring Red Hat
+%define vstring CentOS
 
 # Drop automatic provides for module DSOs
 %{?filter_setup:
@@ -15,10 +15,10 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.6
-Release: 17%{?dist}
+Release: 17%{?dist}.centos.1
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-Source1: index.html
+Source1: centos-noindex.tar.gz
 Source2: httpd.logrotate
 Source3: httpd.sysconf
 Source4: httpd-ssl-pass-dialog
@@ -365,8 +365,10 @@ EOF
 
 # Handle contentdir
 mkdir $RPM_BUILD_ROOT%{contentdir}/noindex
-install -m 644 -p $RPM_SOURCE_DIR/index.html \
-        $RPM_BUILD_ROOT%{contentdir}/noindex/index.html
+tar xzf $RPM_SOURCE_DIR/centos-noindex.tar.gz \
+        -C $RPM_BUILD_ROOT%{contentdir}/noindex/ \
+        --strip-components=1
+
 rm -rf %{contentdir}/htdocs
 
 # remove manual sources
@@ -389,7 +391,7 @@ rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html \
       $RPM_BUILD_ROOT%{docroot}/cgi-bin/*
 
 # Symlink for the powered-by-$DISTRO image:
-ln -s ../../pixmaps/poweredby.png \
+ln -s ../noindex/images/poweredby.png \
         $RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
 
 # symlinks for /etc/httpd
@@ -574,7 +576,7 @@ rm -rf $RPM_BUILD_ROOT
 %{contentdir}/error/README
 %{contentdir}/error/*.var
 %{contentdir}/error/include/*.html
-%{contentdir}/noindex/index.html
+%{contentdir}/noindex/*
 
 %dir %{docroot}
 %dir %{docroot}/cgi-bin
@@ -640,6 +642,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Tue Jun 17 2014 Jim Perrin <jperrin@centos.org> - 2.4.6-17.el7.centos.1
+- Remove index.html, add centos-noindex.tar.gz
+- update welcome.conf with proper aliases
+- change symlink for poweredby.png
+
 * Thu Mar 20 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-17
 - mod_dav: add security fix for CVE-2013-6438 (#1077907)
 - mod_log_config: add security fix for CVE-2014-0098 (#1077907)