--- a/ChangeLog	Thu Sep 28 21:00:41 2006 +0000
+++ b/ChangeLog	Thu Sep 28 21:45:51 2006 +0000
@@ -1,3 +1,11 @@
+2006-09-28 Darren Kenny <[email protected]>
+
+	* libgksu.spec, patches/libgksu1.2-04-rbac-support.diff:
+	  Change way libsecdb is found by adding to configure.ac and call autoconf
+	  in spec to regenerate configure script.
+	* Solaris/SUNWgksu.spec:
+	  Fix the permissions on /etc/gksu.conf
+
 2006-09-28 John  Rice - <[email protected]>
 
         * Javav-Gnome: merge into SUNWgnome-base-libs-java.spec

--- a/Solaris/SUNWgksu.spec	Thu Sep 28 21:00:41 2006 +0000
+++ b/Solaris/SUNWgksu.spec	Thu Sep 28 21:45:51 2006 +0000
@@ -112,7 +112,7 @@
 
 %files root
 %attr (0755, root, sys) %dir %{_sysconfdir}
-%defattr (-, root, sys)
+%defattr (-, root, root)
 %{_sysconfdir}/gksu.conf
 
 %files devel
@@ -135,6 +135,8 @@
 %endif
 
 %changelog
+* Thu Sep 18 2006 - [email protected]
+- Change the group for /etc/gksu.conf to be as the app expects (i.e. root:root)
 * Fri Aug 30 2006 - [email protected]
 - Delete %{_datadir}/locale/locale.alias as it caused a packaging conflict.
 

--- a/libgksu.spec	Thu Sep 28 21:00:41 2006 +0000
+++ b/libgksu.spec	Thu Sep 28 21:45:51 2006 +0000
@@ -64,7 +64,7 @@
 # libtoolize --force
 # aclocal $ACLOCAL_FLAGS
 # automake -a -c -f
-# autoconf
+autoconf
 
 CFLAGS="$RPM_OPT_FLAGS" \
   ./configure \
@@ -104,6 +104,8 @@
 # %exclude %{_libdir}/libgksu*.la
 
 %changelog
+* Thu Sep 28 2006 Darren Kenny <[email protected]>
+- Run autoconf since we're patching configure.ac to look for libsecdb
 * Sat Apr 08 2006 Dries Verachtert <[email protected]> - 1.3.7-1.2
 - Rebuild for Fedora Core 5.
 

--- a/patches/libgksu1.2-04-rbac-support.diff	Thu Sep 28 21:00:41 2006 +0000
+++ b/patches/libgksu1.2-04-rbac-support.diff	Thu Sep 28 21:45:51 2006 +0000
@@ -1,15 +1,21 @@
-diff -u -r libgksu1.2-1.3.1/libgksu.orig/Makefile.in libgksu1.2-1.3.1/libgksu/Makefile.in
---- libgksu1.2-1.3.1/libgksu.orig/Makefile.in	2006-08-01 13:23:40.000000000 +0800
-+++ libgksu1.2-1.3.1/libgksu/Makefile.in	2006-08-02 13:25:28.957300000 +0800
-@@ -198,7 +198,7 @@
- noinst_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = ${PACKAGE}.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -lsecdb
+diff -u libgksu1.2-1.3.1/configure.ac-orig libgksu1.2-1.3.1/configure.ac
+--- libgksu1.2-1.3.1/configure.ac-orig	2005-06-18 15:01:36.000000000 +0100
++++ libgksu1.2-1.3.1/configure.ac	2006-09-28 13:54:02.709646000 +0100
+@@ -67,6 +67,13 @@
+ gnome_keyring_defs=
+ AC_ARG_ENABLE(gnome-keyring, [  --enable-gnome-keyring  Use gnome-keyring to remember passwords [default=no]], enable_gnome_keyring="$enableval", enable_gnome_keyring=no)
  
- EXTRA_DIST = libgksu.ver
- subdir = libgksu
++#Check for RBAC Library libsecdb
++AC_CHECK_LIB([secdb], [getexecuser], [secdb_libs="-lsecdb"],[secdb_libs=""])
++
++if test x$secdb_libs != x ; then
++  LIBS="$LIBS $secdb_libs"
++fi
++
+ AM_CONDITIONAL(ENABLE_GNOME_KEYRING, test x$enable_gnome_keyring = xyes)
+ if test x$enable_gnome_keyring != xyes ; then
+   GNOME_KEYRING=""
+
 diff -u -r libgksu1.2-1.3.1/libgksu.orig/gksu-context.c libgksu1.2-1.3.1/libgksu/gksu-context.c
 --- libgksu1.2-1.3.1/libgksu.orig/gksu-context.c	2006-08-01 11:26:42.000000000 +0800
 +++ libgksu1.2-1.3.1/libgksu/gksu-context.c	2006-08-02 14:27:01.714164000 +0800
@@ -1082,16 +1088,6 @@
  G_END_DECLS
  
  #endif
-diff -u -r libgksu1.2-1.3.1/libgksu.orig/libgksu1.2.pc.in libgksu1.2-1.3.1/libgksu/libgksu1.2.pc.in
---- libgksu1.2-1.3.1/libgksu.orig/libgksu1.2.pc.in	2005-05-13 01:26:56.000000000 +0800
-+++ libgksu1.2-1.3.1/libgksu/libgksu1.2.pc.in	2006-08-02 15:11:15.960412000 +0800
-@@ -7,5 +7,5 @@
- Version: @VERSION@
- Description: GKSu library version 0.
- Requires: glib-2.0
--Libs: -L${libdir} -lgksu1.2 @LIBS@
-+Libs: -L${libdir} -lgksu1.2 -lsecdb @LIBS@
- Cflags: -I${includedir}/libgksu1.2
 diff -u -r libgksu1.2-1.3.1/libgksu.orig/test-gksu.c libgksu1.2-1.3.1/libgksu/test-gksu.c
 --- libgksu1.2-1.3.1/libgksu.orig/test-gksu.c	2005-06-18 22:21:47.000000000 +0800
 +++ libgksu1.2-1.3.1/libgksu/test-gksu.c	2006-08-02 14:30:29.118128000 +0800