From 69235346fa602077e74b090e6baae09fa4ee3db1 Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <theinric@fedoraproject.org>
Date: Dec 10 2008 13:54:40 +0000
Subject: - upgrade to new upstream version

- fix "-p" option's handling
- mark config files as noreplace

---

diff --git a/rsyslog-3.20.2-opts.patch b/rsyslog-3.20.2-opts.patch
new file mode 100644
index 0000000..e43c7be
--- /dev/null
+++ b/rsyslog-3.20.2-opts.patch
@@ -0,0 +1,24 @@
+diff -up rsyslog-3.20.2/tools/syslogd.c.opts rsyslog-3.20.2/tools/syslogd.c
+--- rsyslog-3.20.2/tools/syslogd.c.opts	2008-12-09 11:09:42.000000000 +0100
++++ rsyslog-3.20.2/tools/syslogd.c	2008-12-09 11:11:40.000000000 +0100
+@@ -417,8 +417,9 @@ static void processImInternal(void);
+ 
+ static int usage(void)
+ {
+-	fprintf(stderr, "usage: rsyslogd [-cversion] [-46AdnqQvwx] [-lhostlist] [-sdomainlist]\n"
+-			"                [-fconffile] [-ipidfile]\n"
++	fprintf(stderr, "usage: rsyslogd [-c<version>] [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n"
++			"                [-f<conffile>] [-i<pidfile>] [-M<module load path>]\n"
++			"                [-u<number>]\n"
+ 			"To run rsyslogd in native mode, use \"rsyslogd -c3 <other options>\"\n\n"
+ 			"For further information see http://www.rsyslog.com/doc\n");
+ 	exit(1); /* "good" exit - done to terminate usage() */
+@@ -3008,7 +3009,7 @@ int realMain(int argc, char **argv)
+ 	 * only when actually neeeded. 
+ 	 * rgerhards, 2008-04-04
+ 	 */
+-	while ((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nopqQr::s:t:u:vwx")) != EOF) {
++	while ((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nop:qQr::s:t:u:vwx")) != EOF) {
+ 		switch((char)ch) {
+                 case '4':
+                 case '6':
diff --git a/rsyslog.spec b/rsyslog.spec
index 90f422b..ce1adc2 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -2,8 +2,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 3.18.1
-Release: 2%{?dist}
+Version: 3.20.2
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -12,7 +12,7 @@ Source1: rsyslog.init
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
-Patch0: rsyslog-3.18.1-clock.patch
+Patch0: rsyslog-3.20.2-opts.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -79,7 +79,7 @@ protocol.
 
 %prep
 %setup -q
-%patch -p1 -b .clock
+%patch0 -p1 -b .opts
 
 %build
 %configure	--sbindir=%{sbindir} \
@@ -148,8 +148,10 @@ fi
 %{_libdir}/rsyslog/lmregexp.so
 %{_libdir}/rsyslog/lmtcpclt.so
 %{_libdir}/rsyslog/lmtcpsrv.so
-%config %{_sysconfdir}/rsyslog.conf
-%config %{_sysconfdir}/sysconfig/rsyslog
+%{_libdir}/rsyslog/lmnetstrms.so
+%{_libdir}/rsyslog/lmnsd_ptcp.so
+%config(noreplace) %{_sysconfdir}/rsyslog.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
 %{_initrddir}/rsyslog
 %{sbindir}/rsyslogd
@@ -177,6 +179,11 @@ fi
 %{_libdir}/rsyslog/omrelp.so
 
 %changelog
+* Tue Dec 09 2008 Tomas Heinrich <theinric@redhat.com> 3.20.2-1
+- upgrade
+- fix "-p" option's handling
+- mark config files as noreplace
+
 * Thu Aug 28 2008 Tomas Heinrich <theinric@redhat.com> 3.18.1-2
 - fix clock rollback issue (#460230)