X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apcupsd.spec;h=e3b99116bfed098f993b0a23a80a3f98acfffa67;hb=2f39a000fb026252e7f9a3704f8e9d3cde864670;hp=76d732e46744c82036145f0e168b6d8a18740844;hpb=6ee0bcfb64c5818e49b8ae67ea9c6481074ab369;p=packages%2Fapcupsd.git

diff --git a/apcupsd.spec b/apcupsd.spec
index 76d732e..e3b9911 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -4,13 +4,14 @@
 Summary:	Power management software for APC UPS hardware
 Summary(pl):	Oprogramowanie do zarz±dzania energi± dla UPS-ów APC
 Name:		apcupsd
-Version:	3.10.6
+Version:	3.10.10
 Release:	0.1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
-# Source0-md5:	a015d65ebeae9ee08aacbc8e6e7ac217
-Patch0:		%{name}-paths.patch
+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
@@ -37,27 +38,33 @@ 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
+#%patch0 -p1	
+#-- configure should be patched to move files from /var/log to /var/lib
+#%patch1 -p1	
+#-- probably should be updated
 #%patch2 -p0
 
 %build
-%configure2_13
+%configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/log,/var/lib/apcupsd}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/log,/var/lib/apcupsd,\
+/etc/apcupsd/}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-
-install platforms/redhat/apcupsd $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd
+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
 
+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/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
@@ -67,23 +74,13 @@ rm -rf $RPM_BUILD_ROOT
 
 #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.\
 
-echo '
-if [ -f /etc/apcupsd/powerfail ]; then\
-  echo "APCUPSD to the Rescue!"\
-  echo\
-  /etc/apcupsd/apccontrol killpower \
-  echo\
-  sleep 120\
-  exit 1\
-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
@@ -92,12 +89,13 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog Developers doc/{README.apcaccess,developers_manual,home-page,logo,manual}
+%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}/apcupsd.conf
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/*
 %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