[apcupsd/f13/master] Apply 1 latest change(s) from f14 branch

[Michal Hlavinka]

commit a8f3f76c203f0161fbf1e446fe720f9a75c42a1e
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Dec 2 14:47:21 2010 +0100

    Apply 1 latest change(s) from f14 branch

 apcupsd-httpd.conf |    6 +++++-
 apcupsd.spec       |    8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/apcupsd-httpd.conf b/apcupsd-httpd.conf
index 9e5ff87..973dec9 100644
--- a/apcupsd-httpd.conf
+++ b/apcupsd-httpd.conf
@@ -3,7 +3,11 @@
 #
 
 # files are off the documentroot of Web server
-ScriptAlias /apcupsd/ "/var/www/apcupsd/"
+Alias /apcupsd /var/www/apcupsd
+<Directory /var/www/apcupsd>
+ AddHandler cgi-script cgi pl
+ Options ExecCGI
+</Directory>
 
 #
 # Allow only local access at default
diff --git a/apcupsd.spec b/apcupsd.spec
index 243eb92..bdf256c 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.14.8
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -63,6 +63,9 @@ A GUI interface to the APC UPS monitoring daemon.
 %patch1 -p1 -b .shutdown
 %patch2 -p1 -b .cxxld
 
+#we will handle fedora/redhat part ourselfs
+printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile
+
 %build
 cp -p /usr/lib/rpm/config.{guess,sub} autoconf/
 export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS"
@@ -97,9 +100,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/apcupsd
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT%{_initrddir}/halt
-rm $RPM_BUILD_ROOT%{_initrddir}/halt.old
-
 install -m744 platforms/apccontrol \
               $RPM_BUILD_ROOT%{_sysconfdir}/apcupsd/apccontrol