rpms/tclhttpd/FC-4 tclhttpd.spec, 1.1, 1.2 tclhttpd_fedora.1.patch, 1.1, 1.2

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Use ghosted files for runtime state files.
Update patch to remove build dependency on autoconf.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd.spec	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd.spec	16 Jan 2006 01:48:37 -0000	1.2
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -11,7 +11,7 @@
 Patch0:		tclhttpd_fedora.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: tcl-devel autoconf
+BuildRequires: tcl-devel
 Requires: tcl tclx tcllib fedora-usermgmt
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
@@ -26,8 +26,6 @@
 %prep
 %setup -q -n %{name}%{version}
 %patch -p1
-# Needed to pick up the changes to tcl.m4 in the patch.
-autoreconf
 
 %build
 %configure --with-serverroot=%{contentdir}
@@ -76,6 +74,11 @@
 rm $RPM_BUILD_ROOT/%{contentdir}/htdocs/cgi-bin/env
 mv $RPM_BUILD_ROOT/%{_prefix}/bin/httpd.tcl $RPM_BUILD_ROOT/%{_prefix}/bin/tclhttpd
 
+# Creating ghosted files
+mkdir -p $RPM_BUILD_ROOT/%{_var}/lock/subsys
+touch $RPM_BUILD_ROOT/%{_var}/lock/subsys/tclhttpd
+touch $RPM_BUILD_ROOT/%{_var}/run/tclhttpd/tclhttpd.pid
+
 # Fix some file permissions.
 find $RPM_BUILD_ROOT/%{contentdir}/htdocs -type f -exec chmod a-x {} \;
 find $RPM_BUILD_ROOT/%{contentdir}/custom -type f -exec chmod a-x {} \;
@@ -94,15 +97,12 @@
 if [ "$1" = "0" ]; then
     /sbin/service tclhttpd stop > /dev/null 2>&1
     /sbin/chkconfig --del tclhttpd
-    rm -f %_var/run/tclhttpd/tclhttpd.pid
-    rm -f %_var/lock/subsys/tclhttpd
 fi
 
 %postun
 
 if [ "$1" = "0" ]; then
     /usr/sbin/fedora-userdel tclhttpd
-    rm -rf %_var/log/tclhttpd
 elif [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
@@ -118,14 +118,19 @@
 %config(noreplace) %attr(-,tclhttpd,tclhttpd) %{_sysconfdir}/%{name}
 %{_mandir}/man1/*
 %config(noreplace) %contentdir
-%attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
+%dir %attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
 %attr(-,tclhttpd,tclhttpd) %{_var}/log/tclhttpd
 %{_initrddir}/tclhttpd
 %{_libdir}/crypt1.0
 %{_libdir}/limit1.0
 %doc src/README
+%ghost %{_var}/lock/subsys/tclhttpd
+%ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
+- Use ghosted files for runtime state files.
+- Update patch to remove build dependency on autoconf.
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd_fedora.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd_fedora.1.patch	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd_fedora.1.patch	16 Jan 2006 01:48:37 -0000	1.2
@@ -273,6 +273,19 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` ; do
  		    if test -f "$i/tkConfig.sh" ; then
+diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/configure tclhttpd3.5.1.new/configure
+--- tclhttpd3.5.1/configure	2004-05-28 14:00:58.000000000 -0700
++++ tclhttpd3.5.1.new/configure	2006-01-15 17:27:29.000000000 -0800
+@@ -1222,7 +1222,8 @@
+ 
+ 	    # check in a few common install locations
+ 	    if test x"${ac_cv_c_tclconfig}" = x ; then
+-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
++		for i in `ls -d ${libdir} 2>/dev/null` \
++		        `ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` ; do
+ 		    if test -f "$i/tclConfig.sh" ; then
 diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/lib/utils.tcl tclhttpd3.5.1.new/lib/utils.tcl
 --- tclhttpd3.5.1/lib/utils.tcl	2004-05-26 18:25:19.000000000 -0700
 +++ tclhttpd3.5.1.new/lib/utils.tcl	2004-10-30 16:37:33.000000000 -0700