rpms/glib2/devel glib-2.12.5-poll-check.patch, NONE, 1.1 glib2.spec, 1.112, 1.113

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13419

Modified Files:
	glib2.spec 
Added Files:
	glib-2.12.5-poll-check.patch 
Log Message:
fix configure check for broken  poll


glib-2.12.5-poll-check.patch:
 configure.in |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE glib-2.12.5-poll-check.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/gnome/glib/configure.in,v
retrieving revision 1.533
diff -p -u -B -r1.533 configure.in
--- configure.in	18 Dec 2006 14:38:07 -0000	1.533
+++ configure.in	19 Dec 2006 15:15:54 -0000
@@ -2121,13 +2121,14 @@ else
   glib_cv_value_POLLNVAL=32
 fi
 
-# Check for Mac OS X's broken poll
-if test $cross_compiling != yes ; then
-  AC_MSG_CHECKING(for broken poll)
-  AC_TRY_RUN([[
+AC_MSG_CHECKING([for broken poll])
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 	#include <stdlib.h>
 	#include <fcntl.h>
 	#include <poll.h>
+	#ifdef HAVE_SYS_POLL_H
+	#include <sys/poll.h>
+	#endif
 	int main(void) {
 	  struct pollfd fds[1];
 	  int fd;
@@ -2139,13 +2140,12 @@ if test $cross_compiling != yes ; then
 		exit(1);  /* Does not work for devices -- fail */
 	  }
 	  exit(0);
-	}]],
-    broken_poll=no,
-    broken_poll=yes
-    AC_DEFINE(BROKEN_POLL,1,[poll doesn't work on devices])
-  )
-  AC_MSG_RESULT($broken_poll)
-fi
+	}]])],
+  [broken_poll=no],
+  [broken_poll=yes
+   AC_DEFINE(BROKEN_POLL,1,[poll doesn't work on devices])],
+  [broken_poll="no (cross compiling)"])
+AC_MSG_RESULT($broken_poll)
 
 dnl **********************
 dnl *** Win32 API libs ***


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- glib2.spec	19 Dec 2006 04:06:20 -0000	1.112
+++ glib2.spec	19 Dec 2006 16:22:16 -0000	1.113
@@ -3,13 +3,15 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.12.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/glib/2.12/glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
 Patch0: glib-2.11.1-libdir.patch
+# fixed in upstream cvs
+Patch1: glib-2.12.5-poll-check.patch
 
 Conflicts: libgnomeui <= 2.2.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +46,7 @@
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1 -b .libdir
+%patch1 -p0 -b .poll-check
 
 %build
 for i in config.guess config.sub ; do
@@ -107,6 +110,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.5-2
+- Fix the configure check for broken poll
+
 * Mon Dec 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.5-1
 - Update to 2.12.5