[apcupsd/f16] remove powerfail flag on boot (#768684)

[Michal Hlavinka]

commit d1c14d19e21fc773b4fef3a5b79414dc381871da
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Mon Dec 19 10:24:57 2011 +0100

    remove powerfail flag on boot (#768684)

 apcupsd-3.14.8-systemd.patch |    3 ++-
 apcupsd.spec                 |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/apcupsd-3.14.8-systemd.patch b/apcupsd-3.14.8-systemd.patch
index 06a7c25..b89da36 100644
--- a/apcupsd-3.14.8-systemd.patch
+++ b/apcupsd-3.14.8-systemd.patch
@@ -1,12 +1,13 @@
 diff -up apcupsd-3.14.8/apcupsd.service.systemd apcupsd-3.14.8/apcupsd.service
 --- apcupsd-3.14.8/apcupsd.service.systemd	2011-06-16 10:33:02.335889489 +0200
 +++ apcupsd-3.14.8/apcupsd.service	2011-06-16 09:59:02.616138047 +0200
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,10 @@
 +[Unit]
 +Description=APC UPS Power Control Daemon for Linux
 +After=syslog.target
 +
 +[Service]
++ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail
 +ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf
 +
 +[Install]
diff --git a/apcupsd.spec b/apcupsd.spec
index 8709c7a..0c1a26e 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.14.10
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -211,6 +211,9 @@ fi
 
 
 %changelog
+* Mon Dec 19 2011 Michal Hlavinka <mhlavink at redhat.com> - 3.14.10-2
+- remove powerfail flag on boot (#768684)
+
 * Mon Dec 12 2011 Michal Hlavinka <mhlavink at redhat.com> - 3.14.10-1
 - apcupsd updated to 3.14.10
 - fix MODEL vs. APCMODEL confusion. Remove APCMODEL and rename old MODEL