rpms/nut/devel nut-2.2.1-compile.patch,NONE,1.1 nut.spec,1.57,1.58

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/nut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29067

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.1-compile.patch 
Log Message:
* Tue Feb 12 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.1-3
- fix compilation error with new glibc headers


nut-2.2.1-compile.patch:

--- NEW FILE nut-2.2.1-compile.patch ---
diff -up nut-2.2.1/include/common.h.netdb nut-2.2.1/include/common.h
--- nut-2.2.1/include/common.h.netdb	2008-01-28 03:12:22.000000000 +0100
+++ nut-2.2.1/include/common.h	2008-01-28 03:12:47.000000000 +0100
@@ -38,6 +38,8 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <assert.h>
+#define __USE_GNU
+#include <netdb.h>
 
 #include "timehead.h"
 #include "attribute.h"


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- nut.spec	12 Feb 2008 08:10:37 -0000	1.57
+++ nut.spec	12 Feb 2008 12:22:05 -0000	1.58
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +22,8 @@
 Patch1: nut-2.2.1-multilib.patch
 Patch2: nut-2.2.1-udevusb.patch
 Patch3: nut-2.2.1-glibcopen.patch
-Patch5: nut-2.2.0-usbhal.patch
+Patch4: nut-2.2.0-usbhal.patch
+Patch5: nut-2.2.1-compile.patch
 
 Requires: nut-client => 2.0.0 hal dbus-glib
 Requires(post): fileutils /sbin/chkconfig /sbin/service
@@ -91,7 +92,8 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
-%patch5 -p1 -b .usbhal
+%patch4 -p1 -b .usbhal
+%patch5 -p1 -b .netdb
 
 %build
 %configure \
@@ -299,6 +301,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Tue Feb 12 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.1-3
+- fix compilation error with new glibc headers
+
 * Tue Feb 12 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.1-2
 - rebuild (gcc-4.3)