+Summary: Power management software for APC UPS hardware
+Summary(pl): Oprogramowanie do zarz±dzania energi± dla UPS-ów APC
Name: apcupsd
-Version: 3.5.8
-Release: 2
+Version: 3.8.1
+Release: 3
License: GPL v2
-Group: System Environment/Daemons
-Source: http://www.brisse.dk/site/apcupsd/download/%{name}-%{version}.src.tar.gz
-Patch0: apcups-initscript.patch
-Patch1: apcups-makefile.patch
-Patch2: apcupsd-Makefile-fix.patch
-Summary: power management software for APC UPS hardware
-URL: http://www.brisse.dk/site/apcupsd/
+Group: Networking/Daemons
+Source0: http://www.sibbald.com/apcupsd/download/%{name}-%{version}.tar.gz
+Patch0: %{name}-paths.patch
+Patch1: %{name}-pld.patch
+#Patch1: apcups-makefile.patch
+#Patch2: %{name}-Makefile-fix.patch
+URL: http://www.sibbald.com/apcupsd/
+Requires(post,preun); /sbin/chkconfig
+Requires(post): fileutils
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
#Icon: apcupsd-logo.xpm
+%define _sysconfdir /etc/apcupsd
+
%description
UPS power management under Linux for APCC Products. It allows your
-computer/server to run during power problems for a specified length of time
-or the life of the batteries in your BackUPS, BackUPS Pro, SmartUPS v/s, or
-SmartUPS, and then properly executes a controlled shutdown during an
-extended power failure.
+computer/server to run during power problems for a specified length of
+time or the life of the batteries in your BackUPS, BackUPS Pro,
+SmartUPS v/s, or SmartUPS, and then properly executes a controlled
+shutdown during an extended power failure.
+
+%description -l pl
+Oprogramowanie do zarz±dzania energi± dla UPS-ów APC. Pozwala
+komputerowi dzia³aæ po awarii zasilania przez okre¶lony czas lub czas
+¿ycia akumulatorów w BackUPS, BackUPS Pro, SmartUPS v/s, SmartUPS oraz
+odpowiednio uruchamia kontrolowany shutdown przy d³u¿szej awarii
+zasilania.
%prep
-%setup -q -n %{name}-%{version}.src
+%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p0
+#%patch2 -p0
%build
-mv Makefile Makefile.orig
-cat Makefile.orig \
- | sed "s,^PREFIX =,PREFIX = ${RPM_BUILD_ROOT}," \
- | sed "s,^MANPREFIX = /usr,MANPREFIX = ${RPM_BUILD_ROOT}/usr," \
- > Makefile
-make linux
+%configure2_13
+%{__make}
%install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_mandir}/man8,%{_sysconfdir},/etc/rc.d/init.d,/var/log,/var/lib/apcupsd}
-# Some issues :
-# - why doesn't the Makefile know that it should install *-linux ??
-# - make install tries to stop apcupsd. That's not necessary (buildroot) (hany: not issue anymore)
+install apcupsd apcnetd $RPM_BUILD_ROOT%{_sbindir}
+install apcaccess $RPM_BUILD_ROOT%{_bindir}
+install etc/* $RPM_BUILD_ROOT%{_sysconfdir}
+install distributions/pld/apccontrol.sh $RPM_BUILD_ROOT%{_sysconfdir}/apccontrol
+install distributions/pld/apcupsd $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd
+install doc/apcupsd.man $RPM_BUILD_ROOT%{_mandir}/man8
+tar czf doc.tar.gz doc
-install -d ${RPM_BUILD_ROOT}/{sbin,bin,etc/rc.d/init.d,usr/man/man8,var/log}
-NAME="-linux" make install
-# hany: why this? we're just building. not installing
-#[ -x /sbin/powersc ] && /sbin/powersc RESTARTME
-gzip -9nf \b ${RPM_BUILD_ROOT}/usr/man/*/*.?
-cp -f installs/apcupsd.conf ${RPM_BUILD_ROOT}/etc
-cp -f installs/apcups.rhs ${RPM_BUILD_ROOT}/etc/rc.d/init.d/apcups
touch ${RPM_BUILD_ROOT}/var/log/apcupsd.log
-touch ${RPM_BUILD_ROOT}/etc/apcupsd.status
+touch ${RPM_BUILD_ROOT}/var/lib/apcupsd/apcupsd.status
+touch ${RPM_BUILD_ROOT}/var/lib/apcupsd/apcupsd.events
%clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
-/sbin/chkconfig --add apcups
-if !(grep /sbin/powersc /etc/rc.d/init.d/halt > /dev/null); then
+/sbin/chkconfig --add apcupsd
+
+#if !(grep /sbin/powersc /etc/rc.d/init.d/halt > /dev/null); then
cp -f /etc/rc.d/init.d/halt /etc/rc.d/init.d/halt.rpmorig
-sed -e '/# Now halt or reboot./i\' \
- -e '\
+#sed -e '/# Now halt or reboot./i\' \
+# -e '\
# See if this is a powerfail situation.\
-if [ -f /etc/powerfail ]; then\
+
+echo '
+if [ -f /etc/apcupsd/powerfail ]; then\
echo "APCUPSD to the Rescue!"\
echo\
- /sbin/powersc KILL\
+ /etc/apcupsd/apccontrol killpower \
echo\
sleep 120\
exit 1\
fi\
-' /etc/rc.d/init.d/halt.rpmorig > /etc/rc.d/init.d/halt
-
-fi
-echo Check the documentation to see whether /etc/rc.d/init.d/halt has a
-echo correct invocation of /sbin/powersc .
+' > /etc/rc.d/init.d/halt
+#' /etc/rc.d/init.d/halt.rpmorig > /etc/rc.d/init.d/halt
+#fi
+chmod 754 /etc/rc.d/init.d/halt
%preun
-chkconfig --del apcups
+if [ "$1" = "0" ]; then
+ /sbin/chkconfig --del apcupsd
+fi
%files
%defattr(644,root,root,755)
-%attr(-, root, root) %doc README.NEW Changelog port.gif Statement.APCC
-%attr(-, root, root) %doc %{name}-%{version}.src.lsm
-%attr(-, root, root) %doc readmes/*
-%attr(-, root, root) %doc docs/apcupsd.docs
-%attr(-, root, root) %doc installs/halt.rhs installs/apcups.rhs installs/powersc
-/usr/man/man8/apcupsd.8.gz
-%attr(755, root, bin) /sbin/apcupsd
-%attr(755, root, root) /bin/apcaccess
-%attr(755, root, bin) %config /sbin/powersc
-%attr(640, root, root) %config(noreplace) /etc/apcupsd.conf
-%attr(754, root, root) /etc/rc.d/init.d/apcups
+%doc doc.tar.gz
+%doc ChangeLog
+%{_mandir}/man8/apcupsd.*
+%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_bindir}/*
+#%attr(755,root,root) %config /sbin/powersc
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apcupsd.conf
+%attr(754,root,root) /etc/rc.d/init.d/apcupsd
%ghost /var/log/apcupsd.log
-%ghost /etc/apcupsd.status
+%ghost /var/lib/apcupsd/apcupsd.status
+%ghost /var/lib/apcupsd/apcupsd.events