rpms/sysklogd/devel sysklogd.spec,1.46,1.47

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31940

Modified Files:
	sysklogd.spec 
Log Message:
- do not stop running syslog-ng during sysklogd uninstall (#182605)



Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sysklogd.spec	31 Jan 2007 11:42:33 -0000	1.46
+++ sysklogd.spec	7 Feb 2007 13:04:28 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.4.1
-Release: 45%{?dist}
+Release: 46%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -13,7 +13,6 @@
 Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/service
 Provides: syslog
-BuildRoot: /var/tmp/syslog-root
 Patch0: sysklogd-1.4.1-siginterrupt.patch
 Patch1: sysklogd-1.4.1-noforward_local_address.patch
 Patch2: sysklogd-1.4.1-preserve_percents.patch
@@ -24,6 +23,7 @@
 Patch7: sysklogd-1.4.1-disable__syslog_chk.patch
 Patch8: sysklogd-1.4.1-ipv6.patch
 Patch9: sysklogd-1.4.1-descriptions.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The sysklogd package contains two system utilities (syslogd and klogd)
@@ -83,8 +83,9 @@
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/service syslog stop >/dev/null 2>&1 || :
-   /sbin/chkconfig --del syslog
+	[ -f /var/lock/subsys/syslog ] && 
+		/sbin/service syslog stop >/dev/null 2>&1 || :
+	/sbin/chkconfig --del syslog
 fi
 exit 0
 
@@ -111,6 +112,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Feb 07 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.1-46
+- do not stop running syslog-ng during sysklogd uninstall (#182605)
+
 * Wed Jan 31 2007 Nils Philippsen <nphilipp at redhat.com> 1.4.1-45
 - fix typo in %%post scriptlet