- added /sbin/poweroff-ups

[packages/nut.git] / nut.spec

diff --git a/nut.spec b/nut.spec
index eb1e4de218e3920d5da1333f5049b4dd1c501945..c51a8c636d8db585bf12e486ae56ead5cfea724a 100644 (file)
--- a/nut.spec
+++ b/nut.spec
@@ -3,22 +3,21 @@ Summary(pl):  Sieciowe narz
 Summary(ru):   NUT - Network UPS Tools
 Summary(uk):   NUT - Network UPS Tools
 Name:          nut
-Version:       1.0.0
-Release:       2
+Version:       1.2.1
+Release:       1
 License:       GPL
 Group:         Applications/System
-Source0:       http://www.exploits.org/nut/release/%{name}-%{version}.tar.gz
+Source0:       http://penguin.harrison.k12.co.us/mirrors/nut/release/1.2/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-upsmon.init
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-client.patch
-Patch2:                %{name}-fideltronik.patch
+Patch0:                %{name}-client.patch
 URL:           http://www.exploits.org/nut/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gd-devel >= 2.0.1
 BuildRequires: libpng-devel
+BuildRequires: openssl-devel
 Prereq:                rc-scripts
 Prereq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -116,6 +115,7 @@ UPS 
 Summary:       Files for NUT clients development
 Summary(pl):   Pliki do tworzenia klientów NUT-a
 Group:         Development/Libraries
+Requires:      openssl-devel
 # it does NOT require nut
 
 %description devel
@@ -127,14 +127,12 @@ Plik wynikowy oraz nag
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-install %{_datadir}/automake/config.* .
 %{__aclocal}
 %{__autoconf}
 %configure \
+       --with-ssl \
        --with-cgi \
        --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
        --with-statepath=%{_var}/lib/ups \
@@ -146,7 +144,7 @@ install %{_datadir}/automake/config.* .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{etc/{sysconfig,rc.d/init.d},/var/lib/ups} \
+install -d $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,rc.d/init.d},/var/lib/ups} \
        $RPM_BUILD_ROOT{%{_libdir}/nut,%{_includedir}}
 
 %{__make} install install-cgi \
@@ -157,12 +155,15 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ups
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/upsmon
 
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/*
-install conf/*.users conf/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install conf/*.users conf/*.conf conf/*.html $RPM_BUILD_ROOT%{_sysconfdir}
 
-install clients/upsfetch.o $RPM_BUILD_ROOT%{_libdir}
-install clients/upsfetch.h $RPM_BUILD_ROOT%{_includedir}
+install clients/upsclient.o $RPM_BUILD_ROOT%{_libdir}
+install clients/upsclient.h $RPM_BUILD_ROOT%{_includedir}
 
-ln -s %{_libdir}/nut/upsdrvctl $RPM_BUILD_ROOT%{_sbindir}
+cat > $RPM_BUILD_ROOT/sbin/poweroff-ups << EOF
+#!/bin/sh
+/etc/rc.d/init.d/ups powerdown
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -201,13 +202,15 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README CHANGES CREDITS docs/*
+%doc NEWS README CHANGES CREDITS docs
 %attr(755,root,root) %{_bindir}/upscmd
 %attr(755,root,root) %{_bindir}/upslog
-%attr(755,root,root) %{_sbindir}/upsdrvctl
+%attr(755,root,root) %{_bindir}/upsrw
 %attr(755,root,root) %{_sbindir}/upsd
+%attr(755,root,root) /sbin/poweroff-ups
 %config(noreplace) /etc/sysconfig/ups
 %attr(754,root,root) /etc/rc.d/init.d/ups
+%dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %{_sysconfdir}/upsd.conf
 %attr(640,root,nobody) %config(noreplace) %{_sysconfdir}/ups.conf
 %attr(640,root,root) %config(noreplace) %{_sysconfdir}/upsd.users
@@ -220,23 +223,23 @@ fi
 %files client
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/upsc
-%attr(755,root,root) %{_bindir}/upsct
-%attr(755,root,root) %{_bindir}/upsct2
 %attr(755,root,root) %{_sbindir}/upsmon
 %attr(755,root,root) %{_sbindir}/upssched
 %attr(755,root,root) %{_sbindir}/upssched-cmd
 %attr(754,root,root) /etc/rc.d/init.d/upsmon
+%dir %{_sysconfdir}
 %attr(600,root,root) %config(noreplace) %{_sysconfdir}/upsmon.conf
 %attr(600,root,root) %config(noreplace) %{_sysconfdir}/upssched.conf
 
 %files cgi
 %defattr(644,root,root,755)
 %attr(755,root,root) /home/services/httpd/cgi-bin/*.cgi
+%dir %{_sysconfdir}
 %config(noreplace) %{_sysconfdir}/hosts.conf
-%config(noreplace) %{_sysconfdir}/multimon.conf
 %config(noreplace) %{_sysconfdir}/upsset.conf
+%config(noreplace) %{_sysconfdir}/*.html
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/upsfetch.o
-%{_includedir}/upsfetch.h
+%{_libdir}/upsclient.o
+%{_includedir}/upsclient.h