- upstart_controlled earlier; rel 3

Changed files:
    ntp-client.init -> 1.15
    ntp.init -> 1.28
    ntp.spec -> 1.150

diff --git a/ntp-client.init b/ntp-client.init
index 12a635042371810e4e941df99b8546149f208aca..ff624c597a8adfe3deb15d45beef1705534beb72 100644 (file)
--- a/ntp-client.init
+++ b/ntp-client.init
@@ -8,6 +8,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+upstart_controlled --except cronsettime
+
 # Source networking configuration.
 . /etc/sysconfig/network
 
@@ -46,8 +48,6 @@ stop() {
        rm -f /var/lock/subsys/ntpdate
 }
 
-upstart_controlled --except cronsettime
-
 RETVAL=0
 # See how we were called.
 case "$1" in

diff --git a/ntp.init b/ntp.init
index 77f77f4f05039382eefc80580abde82d1cc1d208..afab09c50c71b0d8717534fb853e05977c266320 100644 (file)
--- a/ntp.init
+++ b/ntp.init
@@ -9,6 +9,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+upstart_controlled
+
 # Source networking configuration.
 . /etc/sysconfig/network
 
@@ -62,8 +64,6 @@ condrestart() {
        fi
 }
 
-upstart_controlled
-
 RETVAL=0
 # See how we were called.
 case "$1" in

diff --git a/ntp.spec b/ntp.spec
index cb7b9e1d99dc48b001fefd5b5536a86d8a44c81f..f9da487ce3e10ce7f15b960b4e00ace97bfcd99a 100644 (file)
--- a/ntp.spec
+++ b/ntp.spec
@@ -11,7 +11,7 @@ Summary(pl.UTF-8):    Narzędzia do synchronizacji czasu (Network Time Protocol)
 Summary(pt_BR.UTF-8):  Network Time Protocol versão 4
 Name:          ntp
 Version:       4.2.6p3
-Release:       2
+Release:       3
 License:       distributable
 Group:         Networking/Daemons
 Source0:       http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz