rpms/tclhttpd/FC-5 tclhttpd.spec,1.6,1.7

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28956

Modified Files:
	tclhttpd.spec 
Log Message:
- Change default paths to ssl files to match Fedora default locations.
- Don't delete the tclhttpd user when uninstalling




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-5/tclhttpd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tclhttpd.spec	2 Apr 2006 20:12:42 -0000	1.6
+++ tclhttpd.spec	24 Apr 2006 23:30:16 -0000	1.7
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -63,6 +63,10 @@
 #    It can be turned on manually if needed.
 sed -e 's/Config uid.*/Config uid tclhttpd/' \
         -e 's/Config gid.*/Config gid tclhttpd/' \
+        -e 's#Config SSL_CADIR.*#Config SSL_CADIR "/etc/pki/tls/certs/"#' \
+        -e 's#Config SSL_CAFILE.*#Config SSL_CAFILE "/etc/pki/tls/certs/ca-bundle.crt"#' \
+        -e 's#Config SSL_CERTFILE.*#Config SSL_CERTFILE     [file join [Config SSL_CADIR] tclhttpd.pem]#' \
+        -e 's#Config SSL_KEYFILE.*#Config SSL_KEYFILE     [file join [Config SSL_CADIR] tclhttpdkey.pem]#' \
         -e 's#Config LogFile.*#Config LogFile %_var/log/tclhttpd/log#' \
         -e 's/#Config Auth {}/Config Auth {}/' < bin/tclhttpd.rc > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/tclhttpd.rc
 sed -e 's/^Debug_Url.*/#&/' < bin/httpdthread.tcl > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/httpdthread.tcl
@@ -106,9 +110,7 @@
 
 %postun
 
-if [ "$1" = "0" ]; then
-    /usr/sbin/fedora-userdel tclhttpd
-elif [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
 
@@ -133,6 +135,10 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Mon Apr 24 2006 Wart <wart at kobold.org> - 3.5.1-12
+- Change default paths to ssl files to match Fedora default locations.
+- Don't delete the tclhttpd user when uninstalling
+
 * Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
 - Don't create the tclhttpd home directory when adding the user.
 - Added patch to disable [fork] if we're running in a threaded Tcl.