- SERVICE=syslog replaced with SERVICE_syslog=y in upstart job

- %upstart_post and %upstart_postun macro definitions removed (they are defined
  in rpm-build-macros)
- Release: 2

Changed files:
    openssh.spec -> 1.363
    opensshd.upstart -> 1.6

diff --git a/openssh.spec b/openssh.spec
index 812acecbdf31002ca033cabdfd9b79b8c9c93e3b..6217dd94806d501fd0343290bf794b83c908eabd 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -29,7 +29,7 @@ Summary(ru.UTF-8):    OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
 Version:       5.8p2
-Release:       1
+Release:       2
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
@@ -94,26 +94,6 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _privsepdir     /usr/share/empty
 %define                schemadir       /usr/share/openldap/schema
 
-## 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 \
-       else \
-               /sbin/service "%1" try-restart \
-       fi
-
-# restart the job after upgrade or migrate to init script on removal
-%define        upstart_postun() \
-       if [ -x /sbin/initctl ] && /sbin/initctl status "%1" 2>/dev/null | grep -q 'running' ; then \
-               /sbin/initctl stop "%1" 2>/dev/null \
-               [ -f "/etc/rc.d/init.d/%1" -o -f "/etc/init/%1.conf" ] && /sbin/service "%1" start \
-       fi
-
-
 %description
 Ssh (Secure Shell) a program for logging into a remote machine and for
 executing commands in a remote machine. It is intended to replace
@@ -424,6 +404,7 @@ Summary(pl.UTF-8):  Opis zadania Upstart dla serwera OpenSSH
 Group:         Daemons
 Requires:      %{name}-server = %{epoch}:%{version}-%{release}
 Requires:      upstart >= 0.6
+Conflicts:     syslog-ng < 3.2.4-1
 
 %description server-upstart
 Upstart job description for OpenSSH.

diff --git a/opensshd.upstart b/opensshd.upstart
index d5cd78563c795a305e7bba9327bcac9c144c73ca..af4f7935ea6384891b9e6dace44aee3735ddca17 100644 (file)
--- a/opensshd.upstart
+++ b/opensshd.upstart
@@ -1,4 +1,4 @@
-start on pld.network-started and started SERVICE=syslog and started random
+start on pld.network-started and started SERVICE_syslog=y and started random
 stop on pld.shutdown-started
 
 respawn