- umask in scripts, other fixes/cosmetics where needed

[packages/apcupsd.git] / apcupsd.spec

diff --git a/apcupsd.spec b/apcupsd.spec
index 4ba6d79519dc0a1a0e5132137b3e1ec13ea8c3b8..0f22049bda939cd36e6e5884fa7eb862f7c37ab8 100644 (file)
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -5,15 +5,14 @@ Version:      3.8.1
 Release:       3
 License:       GPL v2
 Group:         Networking/Daemons
-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
 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/
-Prereq:                chkconfig
+Requires(post,preun);  /sbin/chkconfig
+Requires(post):        fileutils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 #Icon:         apcupsd-logo.xpm
 
@@ -40,7 +39,7 @@ zasilania.
 #%patch2 -p0
 
 %build
-%configure
+%configure2_13
 %{__make}
 
 %install
@@ -63,7 +62,6 @@ touch ${RPM_BUILD_ROOT}/var/lib/apcupsd/apcupsd.events
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add apcupsd
 
 #if !(grep /sbin/powersc /etc/rc.d/init.d/halt > /dev/null); then
@@ -72,7 +70,7 @@ cp -f /etc/rc.d/init.d/halt /etc/rc.d/init.d/halt.rpmorig
 #     -e '\
 # See if this is a powerfail situation.\
 
-echo ' 
+echo '
 if [ -f /etc/apcupsd/powerfail ]; then\
   echo "APCUPSD to the Rescue!"\
   echo\
@@ -84,16 +82,17 @@ fi\
 ' >  /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
 if [ "$1" = "0" ]; then
-       chkconfig --del apcupsd
+       /sbin/chkconfig --del apcupsd
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc.tar.gz 
-%doc ChangeLog 
+%doc doc.tar.gz
+%doc ChangeLog
 %{_mandir}/man8/apcupsd.*
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/*