From ce7207f5ddf7df00315a3eb60f83928dff09d975 Mon Sep 17 00:00:00 2001
From: Jose Pedro Oliveira <jpo@fedoraproject.org>
Date: Wed, 5 Apr 2006 19:52:51 +0000
Subject: [PATCH] Sync with FC-4 CVS branch

---
 .cvsignore     |  2 +-
 sources        |  2 +-
 syslog-ng.spec | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ee1217f..d715cb9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-syslog-ng-1.6.9.tar.gz
+syslog-ng-1.6.10.tar.gz
diff --git a/sources b/sources
index 7c2548f..27c7252 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5280a86b4f5c25b2ba157c8cea302cf0  syslog-ng-1.6.9.tar.gz
+b723dc5e8454bc274fdab415ac7ea5ea  syslog-ng-1.6.10.tar.gz
diff --git a/syslog-ng.spec b/syslog-ng.spec
index e13c2a1..3262d95 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,7 +2,7 @@
 %define sbindir   /sbin
 
 Name:             syslog-ng
-Version:          1.6.9
+Version:          1.6.10
 Release:          1%{?dist}
 Summary:          Syslog replacement daemon
 
@@ -17,8 +17,7 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildConflicts:   libol-devel < 0.3.17
 BuildRequires:    flex, tcp_wrappers, which
-# Requires sed v3.95 (command line option -i)
-Requires:         logrotate, sed >= 3.95
+Requires:         logrotate
 Requires(post):   chkconfig, initscripts
 Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
@@ -48,7 +47,7 @@ ideal for firewalled environments.
 %patch1 -p1
 %{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 chmod a-x contrib/syslog2ng
-mv libol-0.3.17/ChangeLog ChangeLog.libol
+mv libol-0.3.18/ChangeLog ChangeLog.libol
 
 %build
 %configure \
@@ -103,7 +102,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS
-%doc doc/sgml/syslog-ng.txt doc/sgml/syslog-ng.ps
+%doc doc/sgml/syslog-ng.txt
 %doc doc/*.demo doc/*.sample
 %doc contrib/syslog-ng.conf.doc
 %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl
@@ -119,6 +118,9 @@ fi
 
 
 %changelog
+* Thu Mar 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.10-1
+- Update to 1.6.10.
+
 * Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.9-1
 - Build conflict statement
   (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html)
@@ -260,4 +262,4 @@ fi
 * Sun Dec 08 2002 Richard E. Perlotto II <richard@perlotto.com> 1.5.23-1
 - Updated file with notes and PGP signatures
 
-# vim:set ai ts=4 sw=4:
+# vim:set ai ts=4 sw=4 sts=4: