From b69bb185f3a682e8502a8a6089c91690937bb5e7 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Jul 23 2014 14:39:49 +0000
Subject: Roll in CentOS Branding


---

diff --git a/.gitignore b/.gitignore
index 9969f1d..260a2d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 SOURCES/httpd-2.4.6.tar.bz2
+SOURCES/centos-noindex.tar.gz
diff --git a/.httpd.metadata b/.httpd.metadata
index d335a99..bec69cb 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 2e5ffcb..1a39785 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:
@@ -18,7 +18,7 @@ Version: 2.4.6
 Release: 18%{?dist}
 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
@@ -375,8 +375,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
@@ -399,7 +401,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
@@ -584,7 +586,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
@@ -650,6 +652,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Wed Jul 23 2014 Johnny Hughes <johnny@centos.org> - 2.4.6-18.el7.centos
+- Roll in CentOS Branding
+
 * Thu Jul 17 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-18
 - mod_cgid: add security fix for CVE-2014-0231 (#1120607)
 - mod_proxy: add security fix for CVE-2014-0117 (#1120607)