From b21753e3bd5b88721f8fe2bc4e90ce8613882448 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 09:20:35 +0000
Subject: auto-import changelog data from nut-0.44.1-5.src.rpm

Fri Feb 09 2001 Than Ngo <than@redhat.com>
- fixed typo (Bug #26535)
Tue Feb 06 2001 Trond Eivind Glomsr�d <teg@redhat.com>
- Fix some of the i18n
- make it exit cleanly if not configured
Fri Jan 26 2001 Than Ngo <than@redhat.com>
- initscript internationalisation
Thu Jan 11 2001 Than Ngo <than@redhat.com>
- fixed init script error (bug #23525)
Sat Oct 21 2000 Than Ngo <than@redhat.com>
- update to 0.44.1

---

diff --git a/.cvsignore b/.cvsignore
index 550884d..c3db234 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nut-0.44.0.tar.gz
+nut-0.44.1.tar.gz
diff --git a/nut.spec b/nut.spec
index ed37436..4d6f509 100644
--- a/nut.spec
+++ b/nut.spec
@@ -2,14 +2,14 @@
 %define cgidir  /var/www/nut-cgi-bin
 Summary: Network UPS Tools
 Name: nut
-Version: 0.44.0
-Release: 4
+Version: 0.44.1
+Release: 5
 Group: Applications/System
 Source: http://www.exploits.org/nut/release/%{name}-%{version}.tar.gz
 Source1: ups.init
 Source2: ups.sysconfig
 Patch0: nut-0.44.0-buildroot.patch
-Patch1: nut-0.44.0-config.patch
+Patch1: nut-0.44.1-config.patch
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: nut-client
@@ -46,7 +46,7 @@ browser.
 %setup -q
 # remove chown /var/lib/state so that we don't have to build rpms as root.
 %patch0 -p1 -b .buildroot
-%patch1 -p0 -b .config
+%patch1 -p1 -b .config
 
 
 %build
@@ -123,6 +123,22 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb  9 2001 Than Ngo <than@redhat.com>
+- fixed typo (Bug #26535)
+
+* Tue Feb  6 2001 Trond Eivind Glomsr�d <teg@redhat.com>
+- Fix some of the i18n
+- make it exit cleanly if not configured
+
+* Fri Jan 26 2001 Than Ngo <than@redhat.com>
+- initscript internationalisation
+
+* Thu Jan 11 2001 Than Ngo <than@redhat.com>
+- fixed init script error (bug #23525)
+
+* Sat Oct 21 2000 Than Ngo <than@redhat.com>
+- update to 0.44.1
+
 * Tue Aug 01 2000 Than Ngo <than@redhat.de>
 - rebuilt with Michael changes
 
diff --git a/sources b/sources
index 91b7f4b..3197c52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98314d5eb66db0e0eb367623cff16e56  nut-0.44.0.tar.gz
+f34b5c9c4fd55b9763bd801bf88f4ed5  nut-0.44.1.tar.gz
diff --git a/ups.init b/ups.init
index 197ac63..f674614 100644
--- a/ups.init
+++ b/ups.init
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 #
-# chkconfig: - 10 90
+# chkconfig: - 26 74
 # description: The ups daemon automatically starts a shutdown
 # processname: upsd
 # config: /etc/ups/
@@ -23,20 +23,27 @@ fi
 
 start() {
     if [ "$SERVER" = "yes" ]; then
-	echo -n "Starting $MODEL: "
+    # Exit if server = yes and model = NONE (not configured)
+
+	if [ "$MODEL" = "NONE" ]; then 
+	    exit 0
+	fi
+
+	echo -n $"Starting $MODEL: "
 	daemon /usr/bin/$MODEL $OPTIONS $DEVICE 
 	echo
 
-	echo -n "Starting UPS daemon: "
+	prog="upsd"
+	echo -n $"Starting $prog: "
 	daemon /usr/bin/upsd
 	RETVAL=$?
 	echo
 
-	echo -n "Starting UPS monitor (master): "
+	echo -n $"Starting UPS monitor (master): "
 	daemon /usr/bin/upsmon
 	echo
     else
-	echo -n "Starting UPS monitor (slave): "
+	echo -n $"Starting UPS monitor (slave): "
 	daemon /usr/bin/upsmon
 	echo
     fi
@@ -45,17 +52,18 @@ start() {
 }
 
 stop() {
-    echo -n "Stopping UPS monitor: "
+    echo -n $"Stopping UPS monitor: "
     killproc upsmon
     echo
 
     if [ "$SERVER" = "yes" ]; then
-	echo -n "Shutting down UPS daemon: "
+	prog="upsd"
+	echo -n $"Stopping $prog: "
 	killproc upsd
 	RETVAL=$?
 	echo
 
-	echo -n "Shutting down $MODEL: "
+	echo -n $"Shutting down $MODEL: "
 	killproc $MODEL
 	echo
     fi
@@ -89,7 +97,7 @@ case "$1" in
 	status upsmon
 	;;
   *)
-	echo "Usage: ups {start|stop|restart|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
 	exit 1
 esac