rpms/syslog-ng/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 syslog-ng.spec, 1.6, 1.7

[Jose Pedro Oliveira (jpo)]

Author: jpo

Update of /cvs/extras/rpms/syslog-ng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3149/FC-4

Modified Files:
	.cvsignore sources syslog-ng.spec 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 May 2005 17:34:30 -0000	1.3
+++ .cvsignore	2 Dec 2005 20:37:38 -0000	1.4
@@ -1 +1 @@
-syslog-ng-1.6.8.tar.gz
+syslog-ng-1.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 May 2005 17:34:30 -0000	1.3
+++ sources	2 Dec 2005 20:37:38 -0000	1.4
@@ -1 +1 @@
-ffbad7e8e6dcbe385820b8ffba23b622  syslog-ng-1.6.8.tar.gz
+5280a86b4f5c25b2ba157c8cea302cf0  syslog-ng-1.6.9.tar.gz


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-4/syslog-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- syslog-ng.spec	22 Jun 2005 00:30:16 -0000	1.6
+++ syslog-ng.spec	2 Dec 2005 20:37:38 -0000	1.7
@@ -2,20 +2,20 @@
 %define sbindir   /sbin
 
 Name:             syslog-ng
-Version:          1.6.8
-Release:          2%{?dist}
+Version:          1.6.9
+Release:          1%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
 License:          GPL
 Url:              http://www.balabit.com/products/syslog_ng/
-Source0:          http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz
+Source0:          http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz
 Source1:          syslog.log
 Patch0:           syslog-ng-1.6.7-init.patch
 Patch1:           syslog-ng-1.6.7-logrotate.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libol-devel >= 0.3.16
+BuildConflicts:   libol-devel < 0.3.17
 BuildRequires:    flex, tcp_wrappers, which
 # Requires sed v3.95 (command line option -i)
 Requires:         logrotate, sed >= 3.95
@@ -48,6 +48,7 @@
 %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
 
 %build
 %configure \
@@ -106,6 +107,7 @@
 %doc doc/*.demo doc/*.sample
 %doc contrib/syslog-ng.conf.doc
 %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl
+%doc ChangeLog.libol
 %{sbindir}/syslog-ng
 %{_initrddir}/syslog-ng
 %dir %{_sysconfdir}/%{name}
@@ -117,6 +119,14 @@
 
 
 %changelog
+* 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)
+
+* Wed Nov 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.9-0
+- Update to 1.6.9.
+- The libol support library is now included in the syslog-ng tarball.
+
 * Wed Jun 22 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.8-2
 - BuildRequire which, since it's not part of the default buildgroup
   (Konstantin Ryabitsev).