- reverting last change: removing new macros from %p{re,ost}{,un}

[packages/apcupsd.git] / apcupsd.spec

diff --git a/apcupsd.spec b/apcupsd.spec
index 49715cf5cb22aad94d7267fa89c8cc54e5da57f5..12c0df12adf103b66abccc2d2be82726ce9b4954 100644 (file)
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,18 +1,21 @@
+Summary:       Power management software for APC UPS hardware
 Name:          apcupsd
 Version:       3.8.1
-Release:       2
+Release:       3
 License:       GPL v2
 Group:         Networking/Daemons
+Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
-Source0:       http://www.sibbald.com/apcupsd/download/apcupsd-3.8.1.tar.gz
-#Patch0:               apcups-initscript.patch
-#Patch1:               apcups-makefile.patch
-#Patch2:               apcupsd-Makefile-fix.patch
-Summary:       power management software for APC UPS hardware
+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/
 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
@@ -23,38 +26,29 @@ shutdown during an extended power failure.
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
+%patch0 -p1
+%patch1 -p1
 #%patch2 -p0
 
 %build
-
-%configure  --sysconfdir=/etc/apcupsd # --prefix=/usr --sbindir=/sbin --with-cgi-bin=/etc/apcupsd/cgi --enable-cgi 
+%configure
 %{__make}
 
-#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
-
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_mandir}/man8,/etc/apcupsd/,/etc/rc.d/init.d,/var/log}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_mandir}/man8,%{_sysconfdir},/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/etc/apcupsd
-install distributions/redhat/apccontrol.sh $RPM_BUILD_ROOT/etc/apcupsd/apccontrol
-install distributions/redhat/apcupsd  $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd
+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
 
-#[ -x /sbin/powersc ] && /sbin/powersc RESTARTME
 touch ${RPM_BUILD_ROOT}/var/log/apcupsd.log
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/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}
@@ -94,7 +88,8 @@ chkconfig --del 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/apcupsd.conf
+%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 %{_sysconfdir}/apcupsd.status
+%ghost /var/lib/apcupsd/apcupsd.status
+%ghost /var/lib/apcupsd/apcupsd.events