--- a/ChangeLog	Fri Jul 13 11:49:24 2007 +0000
+++ b/ChangeLog	Fri Jul 13 17:24:57 2007 +0000
@@ -1,3 +1,10 @@
+2007-07-13  Damien Carbery <[email protected]>
+
+	* base-specs/control-center.spec: Add patch 16-getpwuid_r to get build
+	  to work. Wrong definition of getpwuid_r being picked up.
+	* patches/control-center-16-getpwuid_r.diff: Added to get build to
+	  work. Wrong definition of getpwuid_r being picked up.
+
 2007-07-13  Laszlo (Laca) Peter  <[email protected]>
 
 	* patches/Python-07-dtrace.diff: updated patch form John Levon,

--- a/base-specs/control-center.spec	Fri Jul 13 11:49:24 2007 +0000
+++ b/base-specs/control-center.spec	Fri Jul 13 17:24:57 2007 +0000
@@ -48,6 +48,8 @@
 Patch14:      control-center-14-full-hinting-dialog.diff
 # date:2007-05-23 owner:dkenny type:bug bugster:6558695 bugzilla:439398
 Patch15:      control-center-15-libslab.diff
+# date:2007-07-13 owner:dcarbery type:feature
+Patch16:      control-center-16-getpwuid_r.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -123,6 +125,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 %ifos linux
@@ -231,6 +234,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Jul 13 2007 - [email protected]
+- Add patch 16-getpwuid_r to get build to work. Wrong definition of getpwuid_r
+  being picked up.
 * Wed May 23 2007 - [email protected]
 - Add patch for bug#6558695 (bugzilla:439398) where libslab was causing g-c-c
   to crash.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-16-getpwuid_r.diff	Fri Jul 13 17:24:57 2007 +0000
@@ -0,0 +1,11 @@
+--- control-center-2.18.1/capplets/about-me/gnome-about-me.c.orig	2007-07-13 17:46:42.026217429 +0100
++++ control-center-2.18.1/capplets/about-me/gnome-about-me.c	2007-07-13 17:59:30.743202297 +0100
+@@ -289,7 +289,7 @@
+ 	struct passwd pwd, *err;
+ 
+ 	int i;
+-#if __sun
++#ifndef __sun
+ 	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
+ 	return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
+ #else