rpms/thttpd/F-7 thttpd.init,1.2,1.3 thttpd.spec,1.12,1.13

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	thttpd.init thttpd.spec 
Log Message:
Add missing requirements for the scriplets (#234740).



Index: thttpd.init
===================================================================
RCS file: /cvs/extras/rpms/thttpd/F-7/thttpd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thttpd.init	9 Nov 2004 02:50:57 -0000	1.2
+++ thttpd.init	19 Jun 2007 17:55:28 -0000	1.3
@@ -1,11 +1,9 @@
 #!/bin/bash
 #
-# $Id$
-#
 # thttpd	This shell script takes care of starting and stopping \
 #		thttpd (tiny/turbo/throttling HTTP server)
 #
-# chkconfig: 345 85 15
+# chkconfig: - 85 15
 # description:	This tiny/turbo/throttling HTTP server is used to \
 #		serve HTML files and CGI.
 #


Index: thttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/thttpd/F-7/thttpd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- thttpd.spec	28 Aug 2006 16:40:12 -0000	1.12
+++ thttpd.spec	19 Jun 2007 17:55:28 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: Tiny, turbo, throttleable lightweight http server
 Name: thttpd
 Version: 2.25b
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.acme.com/software/thttpd/
@@ -16,6 +16,10 @@
 Patch0: thttpd-2.25b-CVE-2005-3124.patch
 Patch1: thttpd-2.25b-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
 
 %description
 Thttpd is a very compact no-frills httpd serving daemon that can handle
@@ -29,9 +33,14 @@
 
 
 %prep
-%setup
+%setup -q
 %patch0 -p1 -b .CVE-2005-3124
 %patch1 -p1 -b .fixes
+# Convert man pages to UTF8
+for man in *.8 */*.8 */*.1; do
+    iconv -f iso8859-1 -t utf-8 -o tmp ${man}
+    %{__mv} -f tmp ${man}
+done
 
 
 %build
@@ -56,8 +65,8 @@
 %{__mkdir_p} %{buildroot}%{_sbindir}
 
 # Install init script and logrotate entry
-%{__install} -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/thttpd
-%{__install} -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/thttpd
+%{__install} -Dpm 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/thttpd
+%{__install} -Dpm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/thttpd
 
 # Main install
 %{__make} install BINDIR=%{buildroot}%{_sbindir} \
@@ -73,7 +82,7 @@
         %{buildroot}%{_mandir}/man1/thtpasswd.1
 
 # Install the default index.html and related files
-%{__install} -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+%{__install} -pm 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
     %{buildroot}%{webroot}/html/
 
 # Install a default configuration file
@@ -123,26 +132,33 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc README TODO
-%config %{_sysconfdir}/rc.d/init.d/thttpd
+%{_sysconfdir}/rc.d/init.d/thttpd
 %config(noreplace) %{_sysconfdir}/logrotate.d/thttpd
 %config(noreplace) %{_sysconfdir}/thttpd.conf
 %{_bindir}/thtpasswd
-%attr(2755, root, www) %{_sbindir}/makeweb
+%attr(2755,root,www) %{_sbindir}/makeweb
 %{_sbindir}/syslogtocern
 %{_sbindir}/thttpd
-%attr(2775, thttpd, www) %dir %{webroot}/
-%attr(2775, thttpd, www) %dir %{webroot}/cgi-bin/
+%attr(2775,thttpd,www) %dir %{webroot}/
+%attr(2775,thttpd,www) %dir %{webroot}/cgi-bin/
 # We don't want those default cgi-bin programs
 %exclude %{webroot}/cgi-bin/*
-%attr(2775, thttpd, www) %dir %{webroot}/html/
-%attr(2664, thttpd, www) %{webroot}/html/*
-%attr(2775, thttpd, www) %dir %{webroot}/logs/
+%attr(2775,thttpd,www) %dir %{webroot}/html/
+%attr(2664,thttpd,www) %{webroot}/html/*
+%attr(2775,thttpd,www) %dir %{webroot}/logs/
 %{_mandir}/man?/*
 
 
 %changelog
+* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 2.25b-13
+- Add missing requirements for the scriplets, they could cause the thttpd user
+  to not be added when thttpd was installed from the F7 media (#234740).
+- Preserve timestamps for all the installed sources.
+- Init scripts are *not* config files.
+- Default service to disable.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 2.25b-12
 - FC6 rebuild.