rpms/gamin/devel gamin-0.1.9-ucred-headers.patch, NONE, 1.1 gamin.spec, 1.65, 1.66

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/gamin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1621

Modified Files:
	gamin.spec 
Added Files:
	gamin-0.1.9-ucred-headers.patch 
Log Message:
* Wed Feb 14 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.1.9-5 - workaround for missing struct ucred in glibc headers (fixed x86_64 compilation)

gamin-0.1.9-ucred-headers.patch:

--- NEW FILE gamin-0.1.9-ucred-headers.patch ---
diff -up gamin-0.1.9/server/gam_channel.c.xxx gamin-0.1.9/server/gam_channel.c
--- gamin-0.1.9/server/gam_channel.c.xxx	2007-07-04 15:36:49.000000000 +0200
+++ gamin-0.1.9/server/gam_channel.c	2008-02-14 10:00:38.654849392 +0100
@@ -3,7 +3,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <glib.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
 #include <sys/uio.h>
@@ -12,6 +11,14 @@
 #include "gam_channel.h"
 #include "gam_protocol.h"
 
+#ifdef HAVE_LINUX
+  /*  Workaround for undefined struct ucred  */
+  #define __USE_GNU
+#endif
+
+#include <sys/socket.h>
+
+
 /* #define CHANNEL_VERBOSE_DEBUGGING */
 /************************************************************************
  *									*
diff -up gamin-0.1.9/libgamin/gam_api.c.xxx gamin-0.1.9/libgamin/gam_api.c
--- gamin-0.1.9/libgamin/gam_api.c.xxx	2007-07-04 15:36:48.000000000 +0200
+++ gamin-0.1.9/libgamin/gam_api.c	2008-02-13 17:41:50.697896914 +0100
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/uio.h>
 #include "fam.h"
@@ -20,6 +19,14 @@
 #include "gam_fork.h"
 #include "gam_error.h"
 
+#ifdef HAVE_LINUX
+  /*  Workaround for undefined struct ucred  */
+  #define __USE_GNU
+#endif
+
+#include <sys/socket.h>
+  
+
 #define TEST_DEBUG
 
 #define MAX_RETRIES 25


Index: gamin.spec
===================================================================
RCS file: /cvs/extras/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gamin.spec	14 Sep 2007 15:18:45 -0000	1.65
+++ gamin.spec	14 Feb 2008 09:48:23 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.9
-Release: 4%{?dist}%{?extra_release}
+Release: 5%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -16,6 +16,8 @@
 Patch0: gamin-0.1.9-poll-less.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=403158
 Patch1: gamin-0.1.9-filesystem-leak.patch
+# patching missing struct ucred in glibc headers
+Patch2: gamin-0.1.9-ucred-headers.patch
 
 %description
 This C library provides an API and ABI compatible file alteration
@@ -48,6 +50,7 @@
 %setup -q
 %patch0 -p1 -b .poll-less
 %patch1 -p1 -b .filesystem-leak
+%patch2 -p1 -b .ucred
 
 %build
 autoreconf --force --install
@@ -96,6 +99,9 @@
 %doc doc/python.html
 
 %changelog
+* Wed Feb 14 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.1.9-5
+- workaround for missing struct ucred in glibc headers (fixed x86_64 compilation)
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.1.9-4
 - Fix a memory leak