From 528e8fc2004e5d0f0f3fbf1195bf676bca18fe88 Mon Sep 17 00:00:00 2001
From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Wed, 15 Jun 2011 12:06:09 +0000
Subject: [PATCH] - use SERVICE_syslog=y in upstart job environment instead of
 SERVICE=syslog,   so the value is not inherited by other jobs. - with_tests
 bcond fixed (run with the library just built) - Release: 1

Changed files:
    syslog-ng.init -> 1.36
    syslog-ng.spec -> 1.213
    syslog-ng.upstart -> 1.4
---
 syslog-ng.init    | 8 ++++----
 syslog-ng.spec    | 7 +++++--
 syslog-ng.upstart | 4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/syslog-ng.init b/syslog-ng.init
index 138641f..6670cd7 100644
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -66,9 +66,9 @@ start() {
 	fi
 
 	msg_starting "syslog-ng"
-	emit starting JOB=syslog-ng SERVICE=syslog
+	emit starting JOB=syslog-ng SERVICE_syslog=y
 	daemon @@SBINDIR@@/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
-	emit --no-wait started JOB=syslog-ng SERVICE=syslog
+	emit --no-wait started JOB=syslog-ng SERVICE_syslog=y
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
 }
@@ -80,9 +80,9 @@ stop() {
 	fi
 
 	msg_stopping "syslog-ng"
-	emit stopping JOB=syslog-ng SERVICE=syslog
+	emit stopping JOB=syslog-ng SERVICE_syslog=y
 	killproc syslog-ng
-	emit --no-wait stopped JOB=syslog-ng SERVICE=syslog
+	emit --no-wait stopped JOB=syslog-ng SERVICE_syslog=y
 	rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
 }
 
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 9ee97b3..dddf845 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -22,7 +22,7 @@ Summary(pl.UTF-8):	Syslog-ng - zamiennik syskloga
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
 Version:	3.2.4
-Release:	0.1
+Release:	1
 License:	GPL v2
 Group:		Daemons
 Source0:	http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
@@ -124,6 +124,9 @@ Summary(pl.UTF-8):	Opis zadania Upstart dla syslog-ng
 Group:		Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires:	upstart >= 0.6
+Conflicts:	avahi-upstart < 0.6.30-2
+Conflicts:	openssh-server-upstart < 2:5.8p2-2
+Conflicts:	postgresql-upstart < 9.0.4-2
 
 %description upstart
 Upstart job description for syslog-ng.
@@ -168,7 +171,7 @@ cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
 %{__make}
 
-%{?with_tests:%{__make} check}
+%{?with_tests:LD_LIBRARY_PATH=$PWD/lib/.libs %{__make} check}
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/syslog-ng.upstart b/syslog-ng.upstart
index 581b7af..ed5edf3 100644
--- a/syslog-ng.upstart
+++ b/syslog-ng.upstart
@@ -2,8 +2,8 @@
 start on pld.sysinit-done
 stop on pld.shutdown-started
 
-env SERVICE=syslog
-export SERVICE
+env SERVICE_syslog=y
+export SERVICE_syslog
 
 respawn
 
-- 
2.44.0