rpms/thttpd/devel index.html, 1.3, 1.4 sources, 1.3, 1.4 thttpd.spec, 1.14, 1.15 powered_by_fedora.png, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Mon Oct 22 11:31:18 UTC 2007
Author: thias
Update of /cvs/extras/rpms/thttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28480
Modified Files:
index.html sources thttpd.spec
Removed Files:
powered_by_fedora.png
Log Message:
Update to latest upstream sources and remove trademarked Fedora image from the package, using a symlink to a system-logos provided image instead.
Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.html 16 Nov 2004 18:49:15 -0000 1.3
+++ index.html 22 Oct 2007 11:30:44 -0000 1.4
@@ -1,13 +1,12 @@
-<?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 thttpd</title>
<style type="text/css">
<!--
- body {background: #ffffff; color: #000000}
+ body {background: #9c9; color: #000}
img {border: none}
-->
</style>
@@ -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>
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 Nov 2004 02:50:50 -0000 1.3
+++ sources 22 Oct 2007 11:30:44 -0000 1.4
@@ -1 +1 @@
-a0e9cd87455d3a0ea11e5ea7e947adf6 thttpd-2.25b.tar.gz
+156b249b3b0bcd48b06badd2db0d56c5 thttpd-2.25b.tar.gz
Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- thttpd.spec 23 Aug 2007 08:03:18 -0000 1.14
+++ thttpd.spec 22 Oct 2007 11:30:44 -0000 1.15
@@ -3,7 +3,7 @@
Summary: Tiny, turbo, throttleable lightweight http server
Name: thttpd
Version: 2.25b
-Release: 14%{?dist}
+Release: 15%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.acme.com/software/thttpd/
@@ -12,10 +12,10 @@
Source2: thttpd.logrotate
Source10: index.html
Source11: thttpd_powered_3.png
-Source12: powered_by_fedora.png
Patch0: thttpd-2.25b-CVE-2005-3124.patch
Patch1: thttpd-2.25b-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: system-logos >= 7.92.1
Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
@@ -82,9 +82,13 @@
%{buildroot}%{_mandir}/man1/thtpasswd.1
# Install the default index.html and related files
-%{__install} -pm 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+%{__install} -pm 0644 %{SOURCE10} %{SOURCE11} \
%{buildroot}%{webroot}/html/
+# Symlink for the powered-by-$DISTRO image
+%{__ln_s} %{_datadir}/pixmaps/poweredby.png \
+ %{buildroot}%{webroot}/html/poweredby.png
+
# Install a default configuration file
%{__cat} << EOF > %{buildroot}%{_sysconfdir}/thttpd.conf
# BEWARE : No empty lines are allowed!
@@ -152,6 +156,12 @@
%changelog
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 2.25b-15
+- Update to latest upstream sources, same filename, only email address changes.
+- Remove trademarked Fedora logo button and replace with a symlink to the
+ main system-logo provided button image.
+- Update default index.html to UTF-8 and thttpd green background color.
+
* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 2.25b-14
- Rebuild to fix wrong execmem requirement on ppc32.
More information about the fedora-extras-commits
mailing list