rpms/httpd/devel httpd.spec, 1.107, 1.108 index.html, 1.23, 1.24 html.xsl, 1.1, NONE

Wed May 9 10:19:33 UTC 2007

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25562

Modified Files:
	httpd.spec index.html 
Removed Files:
	html.xsl 
Log Message:
* Wed May  9 2007 Joe Orton <jorton at redhat.com> 2.2.4-4
- update welcome page branding



Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108

--- httpd.spec	10 Apr 2007 16:44:03 -0000	1.107
+++ httpd.spec	9 May 2007 10:18:59 -0000	1.108
@@ -2,12 +2,11 @@
 %define suexec_caller apache
 %define mmn 20051115
 %define vstring Fedora
-%define distro Fedora Core
 
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.4
-Release: 3
+Release: 4
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -125,7 +124,7 @@
    exit 1
 fi
 
-: Building for '%{distro}' with MMN %{mmn} and vendor string '%{vstring}'
+: Building with MMN %{mmn} and vendor string '%{vstring}'
 
 %build
 # forcibly prevent use of bundled apr, apr-util, pcre
@@ -395,7 +394,7 @@
 %{_sysconfdir}/httpd/logs
 %{_sysconfdir}/httpd/run
 %dir %{_sysconfdir}/httpd/conf
-%config %{_sysconfdir}/httpd/conf/httpd.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/welcome.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/proxy_ajp.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf/magic
@@ -462,6 +461,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Wed May  9 2007 Joe Orton <jorton at redhat.com> 2.2.4-4
+- update welcome page branding
+
 * Tue Apr  3 2007 Joe Orton <jorton at redhat.com> 2.2.4-3
 - drop old triggers, old Requires, xmlto BR
 - use Requires(...) correctly 


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/index.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- index.html	11 Sep 2006 13:36:30 -0000	1.23
+++ index.html	9 May 2007 10:18:59 -0000	1.24
@@ -2,7 +2,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 	<head>
-		<title>Test Page for the Apache HTTP Server on Fedora Core</title>
+		<title>Test Page for the Apache HTTP Server on Fedora</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<style type="text/css">
 			/*<![CDATA[*/
@@ -85,7 +85,7 @@
 	</head>
 
 	<body>
-		<h1>Fedora Core <strong>Test Page</strong></h1>
+		<h1>Fedora <strong>Test Page</strong></h1>
 
 		<div class="content">
 			<div class="content-middle">
@@ -103,7 +103,7 @@
 
 					<p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster at example.com".</p>
 
-					<p>For information on Fedora Core, please visit the <a href="http://fedora.redhat.com/">Fedora Project website</a>.</p>
+					<p>For information on Fedora, please visit the <a href="http://fedoraproject.org/">Fedora Project website</a>.</p>
 					<hr />
 				</div>
 
@@ -113,9 +113,9 @@
 					<p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p>
 
 					<div class="logos">
-						<p>You are free to use the images below on Apache and Fedora Core powered HTTP servers. Thanks for using Apache and Fedora Core!</p>
+						<p>You are free to use the images below on Apache and Fedora powered HTTP servers. Thanks for using Apache and Fedora!</p>
 
-						<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedora.redhat.com/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora Core ]" width="88" height="31" /></a></p>
+						<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedoraproject.org/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora ]" width="88" height="31" /></a></p>
 					</div>
 				</div>
 			</div>


--- html.xsl DELETED ---


