- upstart: add upstart_controlled

Changed files:
    timezone.init -> 1.21
    tzdata.spec -> 1.106

diff --git a/timezone.init b/timezone.init
index f70caf04c018228204b6ed0e3313257519a366a9..2198739173a607bc9d4688443ff8e14f8c8898d7 100644 (file)
--- a/timezone.init
+++ b/timezone.init
@@ -11,6 +11,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+upstart_controlled --except status disable
+
 . /etc/sysconfig/timezone
 
 ZONE_FILE="$ZONE_INFO_DIR"
@@ -79,7 +81,7 @@ case "$1" in
        disable
        ;;
   status)
-       nls 'Time zone is configured to %s' "$TIMEZONE"
+       nls 'Timezone is configured to %s' "$TIMEZONE"
        if [ ! -f "$ZONE_FILE" ]; then
                nls "Missing %s file" "$ZONE_FILE"
        elif ! identical "$ZONE_FILE" /etc/localtime; then

diff --git a/tzdata.spec b/tzdata.spec
index 53af7f8f9c17290e672ffb3f619d4c09080a4a4d..23dca0c7506dcf67d2b5d423f53904f844c8a348 100644 (file)
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -15,7 +15,7 @@ Summary:      Timezone data
 Summary(pl.UTF-8):     Dane o strefach czasowych
 Name:          tzdata
 Version:       %{tzdata_ver}
-Release:       1
+Release:       2
 License:       Public Domain (database), BSD/LGPL v2.1+ (code/test suite)
 Group:         Base
 # The tzdata-base-0.tar.bz2 is a simple building infrastructure and