rpms/thttpd/F-8 thttpd.spec,1.15,1.16

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/thttpd/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29514

Modified Files:
	thttpd.spec 
Log Message:
Backport changes from devel.



Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/F-8/thttpd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- thttpd.spec	22 Oct 2007 11:41:14 -0000	1.15
+++ thttpd.spec	22 Oct 2007 11:46:10 -0000	1.16
@@ -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!
@@ -154,6 +158,9 @@
 %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.