rpms/boa/devel boa-0.94.14rc17-config.patch, 1.2, 1.3 boa.spec, 1.12, 1.13 index.html, 1.2, 1.3 powered_by_fedora.png, 1.1, NONE

Mon Oct 22 14:27:07 UTC 2007

Author: thias

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

Modified Files:
	boa-0.94.14rc17-config.patch boa.spec index.html 
Removed Files:
	powered_by_fedora.png 
Log Message:
Remove trademarked Fedora image, update webroot and default index.html.


boa-0.94.14rc17-config.patch:

Index: boa-0.94.14rc17-config.patch
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/boa-0.94.14rc17-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- boa-0.94.14rc17-config.patch	6 Aug 2007 10:48:03 -0000	1.2
+++ boa-0.94.14rc17-config.patch	22 Oct 2007 14:27:03 -0000	1.3
@@ -24,7 +24,7 @@
  # Comment out to disable server non user files.
  
 -DocumentRoot /var/www
-+DocumentRoot /srv/www/boa/html
++DocumentRoot /var/www/boa/html
  
  # UserDir: The name of the directory which is appended onto a user's home
  # directory if a ~user request is received.


Index: boa.spec
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/boa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- boa.spec	22 Aug 2007 12:41:12 -0000	1.12
+++ boa.spec	22 Oct 2007 14:27:03 -0000	1.13
@@ -1,10 +1,10 @@
 %define rcver rc21
-%define webroot /srv/www/boa
+%define webroot /var/www/boa
 
 Summary: Single-tasking HTTP server
 Name: boa
 Version: 0.94.14
-Release: 0.8%{?rcver:.%{rcver}}%{?dist}
+Release: 0.9%{?rcver:.%{rcver}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.boa.org/
@@ -13,10 +13,10 @@
 Source2: boa.sysconfig
 Source10: index.html
 Source11: boa_logo_pasi2.png
-Source12: powered_by_fedora.png
 Patch0: boa-0.94.14rc17-config.patch
 Patch1: boa-0.94.14rc21-cgi.c.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: system-logos >= 7.92.1
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -81,9 +81,13 @@
 %{__mkdir_p} %{buildroot}/%{_var}/log/boa
 
 # Install the default index.html file
-%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} \
     %{buildroot}%{webroot}/html/
 
+# Symlink for the powered-by-$DISTRO image
+%{__ln_s} %{_datadir}/pixmaps/poweredby.png \
+    %{buildroot}%{webroot}/html/poweredby.png
+
 # Avoid automatic picking up of perl dependency
 %{__chmod} -x examples/*.{cgi,pl}
 
@@ -131,6 +135,11 @@
 
 
 %changelog
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 0.94.14-0.9.rc21
+- Remove trademarked Fedora image and symlink to the one from system-logos.
+- Switch webroot back from /srv to /var.
+- Update default index.html to UTF-8.
+
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 0.94.14-0.8.rc21
 - Rebuild for new BuildID feature.
 


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/boa/devel/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html	14 Apr 2005 18:59:27 -0000	1.2
+++ index.html	22 Oct 2007 14:27:03 -0000	1.3
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="iso-8859-15" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<!-- $Id$ -->
 <head>
   <title>Powered by boa</title>
   <style type="text/css">
     <!--
-      body {background: #ffffff; color: #000000}
-      img  {border: none}
+      body { background: #fff; color: #000 }
+      img  { border: none}
     -->
   </style>
 </head>
@@ -21,7 +20,7 @@
 </p>
 
 <p>
-<a href="http://www.fedora.redhat.com/"><img src="powered_by_fedora.png" width="88" height="31" alt="Powered by Fedora" /></a>
+<img src="poweredby.png" width="88" height="31" alt="Powered by GNU/Linux" />
 </p>
 
 </body>


