packages: syslog-ng/syslog-ng.init, syslog-ng/syslog-ng.spec, syslog-ng/sys...

[jajcus]

Author: jajcus                       Date: Wed Jun 15 12:06:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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

---- Files affected:
packages/syslog-ng:
   syslog-ng.init (1.35 -> 1.36) , syslog-ng.spec (1.212 -> 1.213) , syslog-ng.upstart (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.init
diff -u packages/syslog-ng/syslog-ng.init:1.35 packages/syslog-ng/syslog-ng.init:1.36
--- packages/syslog-ng/syslog-ng.init:1.35	Thu Jan 27 20:34:01 2011
+++ packages/syslog-ng/syslog-ng.init	Wed Jun 15 14:06:08 2011
@@ -66,9 +66,9 @@
 	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 @@
 	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
 }
 

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.212 packages/syslog-ng/syslog-ng.spec:1.213
--- packages/syslog-ng/syslog-ng.spec:1.212	Sat Jun  4 14:48:33 2011
+++ packages/syslog-ng/syslog-ng.spec	Wed Jun 15 14:06:09 2011
@@ -23,7 +23,7 @@
 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
@@ -125,6 +125,9 @@
 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.
@@ -169,7 +172,7 @@
 
 %{__make}
 
-%{?with_tests:%{__make} check}
+%{?with_tests:LD_LIBRARY_PATH=$PWD/lib/.libs %{__make} check}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -307,6 +310,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.213  2011/06/15 12:06:09  jajcus
+- 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
+
 Revision 1.212  2011/06/04 12:48:33  arekm
 - drop link patch since conflicts with syslog-ng developers idea of linking; filterout --as-needed and --no-copy-dt-needed-entries since these also conflict with syslog-ng developers idea of linking
 

================================================================
Index: packages/syslog-ng/syslog-ng.upstart
diff -u packages/syslog-ng/syslog-ng.upstart:1.3 packages/syslog-ng/syslog-ng.upstart:1.4
--- packages/syslog-ng/syslog-ng.upstart:1.3	Thu Jan 27 20:35:11 2011
+++ packages/syslog-ng/syslog-ng.upstart	Wed Jun 15 14:06:09 2011
@@ -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
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.init?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.212&r2=1.213&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.upstart?r1=1.3&r2=1.4&f=u