[rsyslog: 3/3] Merge branch 'f15'

[Bill Nottingham]

commit 11d915d9316bf052b775bd6ae0f4c81a12f4bd80
Merge: 4599366 0dcc29e
Author: Bill Nottingham <notting at redhat.com>
Date:   Mon May 16 15:44:33 2011 -0400

    Merge branch 'f15'
    
    Conflicts:
    	rsyslog.spec

 rsyslog.spec |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --cc rsyslog.spec
index 86ac992,976e6f4..8c63370
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@@ -5,8 -5,8 +5,8 @@@
  
  Summary: Enhanced system logging and kernel message trapping daemon
  Name: rsyslog
 -Version: 5.7.9
 -Release: 3%{?dist}
 +Version: 5.7.10
- Release: 1%{?dist}
++Release: 2%{?dist}
  License: GPLv3+
  Group: System Environment/Daemons
  URL: http://www.rsyslog.com/
@@@ -295,9 -292,9 +292,12 @@@ mv /var/lock/subsys/rsyslogd /var/lock/
  %{_libdir}/rsyslog/omudpspoof.so
  
  %changelog
+ * Mon May 16 2011 Bill Nottingham <notting at redhat.com> - 5.7.9-3
+ - combine triggers (as rpm will only execute one) - fixes upgrades (#699198)
+ 
 +* Tue Apr 05 2011 Tomas Heinrich <theinric at redhat.com> 5.7.10-1
 +- upgrade to new upstream version 5.7.10
 +
  * Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 5.7.9-2
  - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)