Author: jajcus Date: Mon May 24 14:53:17 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- upstart macros now in rpm-build-macros
---- Files affected:
packages/syslog-ng:
syslog-ng.spec (1.187 -> 1.188)
---- Diffs:
================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.187
packages/syslog-ng/syslog-ng.spec:1.188
--- packages/syslog-ng/syslog-ng.spec:1.187 Tue May 11 17:50:50 2010
+++ packages/syslog-ng/syslog-ng.spec Mon May 24 16:53:12 2010
@@ -33,7 +33,7 @@
BuildRequires: bison
BuildRequires: flex
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.561
%if %{with tests}
BuildRequires: libdbi-drivers-sqlite3
BuildRequires: tzdata
@@ -74,25 +74,6 @@
Conflicts: syslog
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-## to be moved to rpm-build-macros
-## TODO: handle RPM_SKIP_AUTO_RESTART
-
-# migrate from init script to upstart job
-%define upstart_post() \
- if [ -f /var/lock/subsys/"%1" ] ; then \
- /sbin/service --no-upstart "%1" stop \
- /sbin/service "%1" start \
- fi
-
-# restart the job after upgrade or migrate to init script on removal
-# cannot be stopped with 'service' as /etc/init/$name.conf may be missing
-# at this point
-%define upstart_postun() \
- if [ -x /sbin/initctl ] && /sbin/initctl status "%1" 2>/dev/null | grep
-q 'running' ; then \
- /sbin/initctl stop "%1" >/dev/null 2>&1 \
- [ -f "/etc/rc.d/init.d/%1" -o -f "/etc/init/%1.conf" ] && {
echo -n "Re-" ; /sbin/service "%1" start ; } ; \
- fi
-
%description
syslog-ng is a syslogd replacement for Unix and Unix-like systems. It
has been tested on Solaris, BSDi and Linux, and were found to run
@@ -117,7 +98,7 @@
%package upstart
Summary: Upstart job description for syslog-ng
-Summary(pl.UTF-8): Opis zadania Upstart dl syslog-ng
+Summary(pl.UTF-8): Opis zadania Upstart dla syslog-ng
Group: Daemons
Requires: %{name} = %{version}-%{release}
Requires: upstart >= 0.6
@@ -126,7 +107,7 @@
Upstart job description for syslog-ng.
%description upstart -l pl.UTF-8
-Opis zadania Upstart dl syslog-ng.
+Opis zadania Upstart dla syslog-ng.
%prep
%setup -q
@@ -243,6 +224,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.188 2010/05/24 14:53:12 jajcus
+- upstart macros now in rpm-build-macros
+
Revision 1.187 2010/05/11 15:50:50 jajcus
- do not restart the upstart service twice
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.187&r2=1.188&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
