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

Tue Feb 20 16:18:27 UTC 2007

Author: pvrabec

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

Modified Files:
	sysklogd.spec 
Log Message:
fix spec file to meet Fedora standards (#226448)



Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48

--- sysklogd.spec	7 Feb 2007 13:04:28 -0000	1.47
+++ sysklogd.spec	20 Feb 2007 16:18:25 -0000	1.48
@@ -1,16 +1,15 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.4.1
-Release: 46%{?dist}
+Release: 47%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
 Source: sysklogd-%{version}rh.tar.gz
-Prereq: fileutils /sbin/chkconfig /etc/init.d
 Conflicts: logrotate < 3.5.2
 Requires: bash >= 2.0
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
+Requires(post): /sbin/chkconfig coreutils
+Requires(preun): /sbin/chkconfig /sbin/chkconfig
 Requires(postun): /sbin/service
 Provides: syslog
 Patch0: sysklogd-1.4.1-siginterrupt.patch
@@ -62,7 +61,7 @@
 
 mkdir -p $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig}
 install -m755 redhat/syslog.init $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog
-install -m644 redhat/syslog.log $RPM_BUILD_ROOT/etc/logrotate.d/syslog
+install -m644 redhat/syslog.log $RPM_BUILD_ROOT/etc/logrotate.d/sysklogd
 install -m644 redhat/syslog $RPM_BUILD_ROOT/etc/sysconfig/syslog
 
 chmod 755 $RPM_BUILD_ROOT/sbin/syslogd
@@ -103,15 +102,18 @@
 
 %files
 %defattr(-,root,root)
-%doc ANNOUNCE CHANGES README* NEWS INSTALL redhat/ChangeLog
+%doc ANNOUNCE CHANGES README* NEWS INSTALL COPYING redhat/ChangeLog
 %config(noreplace) %{_sysconfdir}/syslog.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/syslog
-%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
+%config(noreplace) %{_sysconfdir}/logrotate.d/sysklogd
 %{_sysconfdir}/rc.d/init.d/syslog
 /sbin/*
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 20 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.1-47
+- fix spec file to meet Fedora standards (#226448)
+
 * Wed Feb 07 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.1-46
 - do not stop running syslog-ng during sysklogd uninstall (#182605)
 
@@ -143,10 +145,10 @@
 - Add Requires(post) and (postun) on /sbin/service (fixes scriptlet errors)
 
 * Wed Jun 14 2006 Jason Vas Dias <jvdias at redhat.com> - 1.4.1-38
-- fix bug 194494 - move logfile touching back to %postun
+- fix bug 194494 - move logfile touching back to %%postun
 
 * Thu Feb 23 2006 Jason Vas Dias <jvdias at redhat.com> - 1.4.1-36
-- fix bug 182605: only chkconfig --add in %post if $1 -eq 1
+- fix bug 182605: only chkconfig --add in %%post if $1 -eq 1
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-34.2
 - bump again for double-long bug on ppc(64)
@@ -162,8 +164,8 @@
 
 * Wed Aug 24 2005 Jason Vas Dias <jvdias at redhat.com> 1.4.1rh-33
 - fix bug 166643: klogd needs to use internal syslog functions in syslog.c,
-                  because only they allow logging with facility==kernel.
-		  Fix prototypes to allow use of internal syslog functions.
+  because only they allow logging with facility==kernel.
+- fix prototypes to allow use of internal syslog functions.
 
 * Mon Aug 15 2005 Jason Vas Dias <jvdias at redhat.com> 1.4.1rh-32
 - fix bug 165972: remove unused syslog.o from klogd; do not compile syslog.c
@@ -174,12 +176,12 @@
 		  with initscript SYSLOG_UMASK option
 
 * Thu May 19 2005 Jason Vas Dias <jvdias at redhat.com> 1.4.1rh-30
-- fix bug 158205: fix MARK message generation
-                  Patch contributed by Ray Van Tassle of Motorola
+- fix bug 158205: fix MARK message generation. Patch contributed 
+  by Ray Van Tassle of Motorola
 
 * Mon Mar 28 2005 Jason Vas Dias <jvdias at redhat.com> 1.4.1rh-28
 - Fix bug 152319: potential ctime() deadlock in domark() when called
--                 from signal handler
+  from signal handler
 
 * Fri Jan 14 2005 Jason Vas Dias <jvdias at redhat.com> 1.4.1rh-26
 - Final fixup of '@host' name checking code: remove possible
@@ -264,7 +266,7 @@
 
 * Fri Aug  3 2001 Bill Nottingham <notting at redhat.com>
 - require a specific version of logrotate (#50794)
-- fix %preun for the case when it's not running (#50123)
+- fix %%preun for the case when it's not running (#50123)
 
 * Sun Jul  8 2001 Bill Nottingham <notting at redhat.com>
 - merge with 1.4.1
@@ -309,7 +311,7 @@
 - start at position 12, not 30 (we *need* to be before nfslock now)
 
 * Fri Jul 28 2000 Bill Nottingham <notting at redhat.com>
-- um, how did %preun get tacked onto %post?
+- um, how did %%preun get tacked onto %%post?
 - fix condrestart stuff
 
 * Fri Jul 21 2000 Bill Nottingham <notting at redhat.com>
@@ -409,13 +411,13 @@
 - make klogd translate SPARC register dumps and oopses.
 
 * Tue Aug 11 1998 Jeff Johnson <jbj at redhat.com>
-- add %clean
+- add %%clean
 
 * Tue Aug  4 1998 Chris Adams <cadams at ro.com>
 - only log to entries that are USER_PROCESS (fix #822)
 
 * Mon Jul 27 1998 Jeff Johnson <jbj at redhat.com>
-- remove RPM_BUILD_ROOT from %post
+- remove RPM_BUILD_ROOT from %%post
 
 * Wed Apr 29 1998 Cristian Gafton <gafton at redhat.com>
 - patch to support Buildroot


