- release 3,

- merge some rawhide patches,
- fix ac (remove all silly thing from try find libgd),
- regenerate ac files (spec is ac 2.5x ready),
- rebuild against gd 2.0.1.

Changed files:
    nut.spec -> 1.20

diff --git a/nut.spec b/nut.spec
index 59c6519627a20ba0147fd39e8603f0d30c8547a7..2dbd51f5906c2ff5bb57298cac57e1eadf3f76f1 100644 (file)
--- a/nut.spec
+++ b/nut.spec
@@ -2,7 +2,7 @@ Summary:        Network UPS Tools
 Summary(pl):   Sieciowe narzêdzie do UPS-ów
 Name:          nut
 Version:       0.45.0
-Release:       1
+Release:       3
 License:       GPL
 Group:         Applications/System
 Group(de):     Applikationen/System
@@ -11,8 +11,13 @@ Source0:     http://www.exploits.org/nut/release/%{name}-%{version}.tar.gz
 Source1:       ups.init
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-ever.patch
+Patch2:                %{name}-nonblock.patch
+Patch3:                %{name}-config.patch
+Patch4:                %{name}-client.patch
+Patch5:                %{name}-lookup_for_libgd_ac_fix.patch
 URL:           http://www.exploits.org/nut/
-BuildRequires: gd-devel
+BuildRequires: autoconf
+BuildRequires: gd-devel >= 2.0.1
 BuildRequires: libpng-devel
 Prereq:                rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,8 +60,13 @@ for safe shutdowns, live status tracking on web pages, and more.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
+autoconf
 %configure \
        --with-statepath=/var/lib/ups \
        --with-uid=99 \
@@ -74,14 +84,6 @@ install -d $RPM_BUILD_ROOT/{etc/{sysconfig,rc.d/init.d},/var/lib/ups}
 install scripts/RedHat-6.0/ups-config $RPM_BUILD_ROOT/etc/sysconfig/ups
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ups
 
-(
-cd $RPM_BUILD_ROOT%{_sysconfdir}
-for i in `ls *`
-do
-       mv $i `basename $i .sample`
-done
-)
-
 gzip -9nf CREDITS README docs/{FAQ,Changes*,*.txt,cables/*}
 
 %post
@@ -144,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %config(noreplace) %{_sysconfdir}/hosts.conf
 %config(noreplace) %{_sysconfdir}/multimon.conf
 %attr(600,root,root) %config(noreplace) %{_sysconfdir}/upsmon.conf