From 79f87cb526a43bf9f208d602fc006fbba105795c Mon Sep 17 00:00:00 2001 From: Andrzej Augustynowicz Date: Wed, 21 Apr 2004 17:24:19 +0000 Subject: [PATCH] - updated to 3.10.12 (almost all fixes from Zbigniew Bryczkowski) - added init script, logrotate - patch0 - fix dirs - %%post,%%preun,%%files fixes - rel. 0.9 - need to be tested Changed files: apcupsd.spec -> 1.36 --- apcupsd.spec | 105 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 41 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index e3b9911..1d93995 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,21 +1,22 @@ -# TODO: -# - update paths and pld patches -# - avoid messing in halt script in %post +# +# Conditional build: +%bcond_with usb # with USB support +# Summary: Power management software for APC UPS hardware Summary(pl): Oprogramowanie do zarz±dzania energi± dla UPS-ów APC Name: apcupsd -Version: 3.10.10 -Release: 0.1 +Version: 3.10.12 +Release: 0.9 License: GPL v2 Group: Networking/Daemons Source0: http://dl.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz +# Source0-md5: 4c35774d587c54276cf03926768ad551 +Source1: %{name}.init +Source2: %{name}.logrotate Source10: %{name}-rc.d-halt -# Source0-md5: b69ccf4f4196582ab3e26bf6af937610 -Patch0: %{name}-paths.patch -Patch1: %{name}-pld.patch -#Patch1: apcups-makefile.patch -#Patch2: %{name}-Makefile-fix.patch +Patch0: %{name}-configure.patch URL: http://www.apcupsd.com/ +BuildRequires: autoconf Requires(post,preun): /sbin/chkconfig Requires(post): fileutils BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -38,53 +39,67 @@ zasilania. %prep %setup -q -#%patch0 -p1 -#-- configure should be patched to move files from /var/log to /var/lib -#%patch1 -p1 -#-- probably should be updated -#%patch2 -p0 +%patch0 -p1 %build -%configure +cd autoconf +%{__autoconf} +cp -f ./configure .. +cd .. +%configure \ + --with-log-dir=%{_var}/log \ + --with-stat-dir=%{_var}/lib/apcupsd \ +%if %{with usb} + --enable-usb \ + --with-serial-dev=/dev/usb/hiddev[0-15] \ + --with-upstype=usb \ + --with-upscable=usb +%endif + %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/log,/var/lib/apcupsd,\ -/etc/apcupsd/} +install -d $RPM_BUILD_ROOT/etc/{apcupsd,logrotate.d,rc.d/init.d} \ + $RPM_BUILD_ROOT/var/{log,lib/apcupsd} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install platforms/unknown/apcupsd $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd -#install platforms/pld/apcupsd $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/halt-apcupsd +install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd +install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apcupsd -mkdir -p $RPM_BUILD_ROOT/var/log -mkdir -p $RPM_BUILD_ROOT/var/lib/apcupsd -touch $RPM_BUILD_ROOT/var/log/apcupsd.log +touch $RPM_BUILD_ROOT/var/log/apcupsd.events touch $RPM_BUILD_ROOT/var/lib/apcupsd/apcupsd.status -touch $RPM_BUILD_ROOT/var/lib/apcupsd/apcupsd.events -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} %clean rm -rf $RPM_BUILD_ROOT %post -/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 -ln -s /etc/rc.d/init.d/halt-apcupsd /etc/rc.d/init.d/halt -#sed -e '/# Now halt or reboot./i\' \ -# -e '\ -# See if this is a powerfail situation.\ +if [ "$1" = "1" ]; then + /sbin/chkconfig --add apcupsd + if [ -e /etc/rc.d/init.d/halt ]; then + mv -f /etc/rc.d/init.d/halt /etc/rc.d/init.d/halt.rpmorig + fi + ln -s /etc/rc.d/init.d/halt-apcupsd /etc/rc.d/init.d/halt +fi -#' /etc/rc.d/init.d/halt.rpmorig > /etc/rc.d/init.d/halt -#fi +if [ -f /var/lock/subsys/apcupsd ]; then + /etc/rc.d/init.d/apcupsd restart >&2 +else + echo "Run \"/etc/rc.d/init.d/apcupsd start\" to start apcupsd daemon." +fi %preun if [ "$1" = "0" ]; then - /sbin/chkconfig --del apcupsd + if [ -f /var/lock/subsys/apcupsd ]; then + /etc/rc.d/init.d/apcupsd stop >&2 + fi + rm -f /etc/rc.d/init.d/halt + if [ -e /etc/rc.d/init.d/halt.rpmorig ]; then + mv -f /etc/rc.d/init.d/halt /etc/rc.d/init.d/halt.rpmorig + fi + /sbin/chkconfig --del apcupsd fi %files @@ -92,10 +107,18 @@ fi %doc ChangeLog Developers doc/{README.apcaccess,developers_manual,home-page,logo} %{_mandir}/man8/apcupsd.* %attr(755,root,root) %{_sbindir}/* -#%attr(755,root,root) %config /sbin/powersc -%attr(640,root,root) %config(noreplace) %{_sysconfdir}/* +%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apcupsd.conf +%attr(754,root,root) %{_sysconfdir}/apccontrol +%attr(754,root,root) %{_sysconfdir}/changeme +%attr(754,root,root) %{_sysconfdir}/commfailure +%attr(754,root,root) %{_sysconfdir}/commok +%attr(754,root,root) %{_sysconfdir}/mainsback +%attr(754,root,root) %{_sysconfdir}/masterconnect +%attr(754,root,root) %{_sysconfdir}/mastertimeout +%attr(754,root,root) %{_sysconfdir}/onbattery %attr(754,root,root) /etc/rc.d/init.d/apcupsd %attr(754,root,root) /etc/rc.d/init.d/halt-apcupsd -%ghost /var/log/apcupsd.log -%ghost /var/lib/apcupsd/apcupsd.status -%ghost /var/lib/apcupsd/apcupsd.events +%attr(640,root,root) /etc/logrotate.d/apcupsd +%dir /var/lib/apcupsd +%attr(640,root,root) %ghost /var/log/apcupsd.events +%attr(640,root,root) %ghost /var/lib/apcupsd/apcupsd.status -- 2.44.0