X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapcupsd.git;a=blobdiff_plain;f=apcupsd.spec;h=83d7b066b0f2693f00683515f0fbdaf265221c40;hp=b8535cde323fc4cbc76c0a4808c547452ef7cab9;hb=d5bc45dadcb227910dc4cb7454fdc8946f67dd2f;hpb=1eccb2a32d3fefc6ce266130314f988e1adc70fd

diff --git a/apcupsd.spec b/apcupsd.spec
index b8535cd..83d7b06 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,19 +1,22 @@
+# TODO:
+# - update paths and pld patches
+# - avoid messing in halt script in %post
 Summary:	Power management software for APC UPS hardware
 Summary(pl):	Oprogramowanie do zarz±dzania energi± dla UPS-ów APC
 Name:		apcupsd
-Version:	3.8.1
-Release:	3
+Version:	3.10.5
+Release:	0.1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.sibbald.com/apcupsd/download/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/apcupsd/%{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
+URL:		http://www.apcupsd.com/
+Requires(post,preun):	/sbin/chkconfig
+Requires(post):	fileutils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-#Icon:		apcupsd-logo.xpm
 
 %define		_sysconfdir	/etc/apcupsd
 
@@ -33,8 +36,8 @@ zasilania.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1	-- configure should be patched to move files from /var/log to /var/lib
+#%patch1 -p1	-- probably should be updated
 #%patch2 -p0
 
 %build
@@ -43,25 +46,22 @@ zasilania.
 
 %install
 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}
+#install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/log,/var/lib/apcupsd}
 
-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
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-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
+install platforms/redhat/apcupsd $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd
+#install platforms/pld/apcupsd  $RPM_BUILD_ROOT/etc/rc.d/init.d/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
 
 %clean
 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
@@ -70,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\
@@ -82,19 +82,18 @@ 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 ChangeLog Developers doc/{README.apcaccess,developers_manual,home-page,logo,manual}
 %{_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