rpms/syslog-ng/devel syslog-ng.spec,1.8,1.9

[Jose Pedro Oliveira (jpo)]

Author: jpo

Update of /cvs/extras/rpms/syslog-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30635

Modified Files:
	syslog-ng.spec 
Log Message:
- Build conflict statement.
  The libol support library is now included in the syslog-ng tarball
    (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html).



Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- syslog-ng.spec	23 Nov 2005 15:49:33 -0000	1.8
+++ syslog-ng.spec	30 Nov 2005 15:57:02 -0000	1.9
@@ -15,7 +15,7 @@
 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
@@ -119,7 +119,11 @@
 
 
 %changelog
-* Wed Nov 23 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.9-1
+* 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.