--- a/ChangeLog	Mon Aug 06 23:26:54 2007 +0000
+++ b/ChangeLog	Mon Aug 06 23:40:50 2007 +0000
@@ -1,3 +1,13 @@
+2007-08-07  Brian Cameron  <[email protected]>
+
+	* SUNWdbus.spec, base-specs/dbus.spec, base-specs/dbus-glib.spec,
+	  base-specs/dbus-python.spec, patches/dbus-02-fixconfigure.diff,
+	  patches/dbus-03-clearenv.diff:  Bump D-Bus to 1.1.2, 
+	  dbus-glib to 0.74, and dbus-python to 0.82.2.  Fix symlink so
+	  it works when the D-Bus library is bumped to a new 3.x version
+	  and we don't have to update the symlink each time.
+	* patches/dbus-02-daemndir.diff: Remove upstream patch.
+
 2007-08-07  Jeff Cai <[email protected]>
 
 	* base-specs/gtkhtml.spec: Remove patch -01-search.diff

--- a/SUNWdbus.spec	Mon Aug 06 23:26:54 2007 +0000
+++ b/SUNWdbus.spec	Mon Aug 06 23:40:50 2007 +0000
@@ -78,7 +78,7 @@
 
 # Create symlink to support hal which was built with an older version of dbus.
 cd $RPM_BUILD_ROOT%{_libdir}
-ln -s libdbus-1.so.3.2.0 libdbus-1.so.2 
+ln -s libdbus-1.so.3 libdbus-1.so.2 
 
 mkdir -p $RPM_BUILD_ROOT/var/svc/manifest/system
 chmod -R 755 $RPM_BUILD_ROOT/var/svc
@@ -157,7 +157,10 @@
 %{_bindir}/*
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/libdbus*
+%{_libdir}/dbus-1.0
+%{_libexecdir}/dbus-1
 %{_libexecdir}/dbus-daemon
+%{_libexecdir}/dbus-daemon-launch-helper
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/dbus-1
 %dir %attr(0755, root, bin) %{_mandir}
@@ -203,6 +206,10 @@
 %endif
 
 %changelog
+* Mon Aug 06 2007 - [email protected]
+- Fix packaging after bumping to 1.1.2.  Also fix the symlink so we
+  link to libdbus-1.so.3 rather than libdbus-1.so.3.# so we don't have
+  to update the link each time we upgrade the D-Bus library.
 * Sun Feb 25 2007 - [email protected]
 - updated to include 64-bit build RFE: #6480511
 * Fri Dec 15 2006 - [email protected]

--- a/base-specs/dbus-glib.spec	Mon Aug 06 23:26:54 2007 +0000
+++ b/base-specs/dbus-glib.spec	Mon Aug 06 23:40:50 2007 +0000
@@ -11,7 +11,7 @@
 Name:         dbus-glib
 License:      GPL/AFL
 Group:        System/Libraries
-Version:      0.73
+Version:      0.74
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -102,7 +102,8 @@
 aclocal $ACLOCAL_FLAGS
 autoconf
 automake -a -c -f
-CFLAGS="$RPM_OPT_FLAGS"				\
+export CFLAGS="$RPM_OPT_FLAGS -I/usr/sfw/include"
+export LDFLAGS="$LDFLAGS -L/usr/sfw/lib -R/usr/sfw/lib"
 ./configure --prefix=%{_prefix}			\
             --includedir=%{_includedir}		\
             --sysconfdir=%{_sysconfdir}		\
@@ -161,6 +162,8 @@
 %{_libdir}/python?.?/vendor-packages/*
 
 %changelog
+* Mon Aug 06 2007 - [email protected]
+- Bump to 0.74.
 * Sun Apr  1 2007 - [email protected]
 - add missing aclocal calls
 * Wed Mar 15 2007 - [email protected]

--- a/base-specs/dbus-python.spec	Mon Aug 06 23:26:54 2007 +0000
+++ b/base-specs/dbus-python.spec	Mon Aug 06 23:40:50 2007 +0000
@@ -13,7 +13,7 @@
 Name:         dbus-python
 License:      GPL/AFL
 Group:        System/Libraries
-Version:      0.80.2
+Version:      0.82.2
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -65,7 +65,7 @@
 
 cd ../%{name}-%{version}-64
 
-aclocal $ACLOCAL_FLAGS
+aclocal $ACLOCAL_FLAGS -I ./m4
 autoconf
 automake -a -c -f
 ./configure --prefix=%{_prefix}				\
@@ -90,7 +90,7 @@
 %endif
 %endif
 
-aclocal $ACLOCAL_FLAGS
+aclocal $ACLOCAL_FLAGS -I ./m4
 autoconf
 automake -a -c -f
 CFLAGS="$RPM_OPT_FLAGS"				\
@@ -159,6 +159,8 @@
 %{_libdir}/python?.?/vendor-packages/*
 
 %changelog
+* Mon Aug 06 2007 - [email protected]
+- Bump to 0.82.2 add "-I ./m4" to aclocal calls.
 * Sun Apr  1 2007 - [email protected]
 - add missing aclocal calls
 * Wed Mar 15 2007 - [email protected]

--- a/base-specs/dbus.spec	Mon Aug 06 23:26:54 2007 +0000
+++ b/base-specs/dbus.spec	Mon Aug 06 23:40:50 2007 +0000
@@ -11,8 +11,8 @@
 Name:         dbus
 License:      GPL/AFL
 Group:        System/Libraries
-Version:      1.0.2 
-Release:      2
+Version:      1.1.2 
+Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Simple IPC library based on messages
@@ -20,8 +20,10 @@
 URL:          http://www.freedesktop.org/wiki/Software_2fdbus
 #owner:drdoug type:bug date:2007-02-23 bugzilla:10080
 Patch1:       dbus-01-have-atomic.diff
-#owner:yippi date:2007-03-02 type:bug bugzilla:10153 state:upstream
-Patch2:       dbus-02-daemondir.diff
+#owner:yippi date:2007-08-06 type:bug bugzilla:11872
+Patch2:       dbus-02-fixconfigure.diff
+#owner:yippi date:2007-08-06 type:bug bugzilla:11872
+Patch3:       dbus-03-clearenv.diff
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:	      %{_defaultdocdir}/doc
 Autoreqprov:  on
@@ -66,6 +68,7 @@
 %ifos solaris
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %ifarch amd64 sparcv9
 cd ..
 cp -pr %{name}-%{version} %{name}-%{version}-64
@@ -99,6 +102,7 @@
             --includedir=%{_includedir} 		\
             --sysconfdir=%{_sysconfdir} 		\
             --libdir=%{_libdir}/%{_arch64} 		\
+            --libexecdir=%{_libexecdir}			\
             --bindir=%{_bindir}				\
             --localstatedir=%{_localstatedir}		\
             --with-dbus-user=root       		\
@@ -125,6 +129,7 @@
             --includedir=%{_includedir} 	\
             --sysconfdir=%{_sysconfdir} 	\
             --libdir=%{_libdir}			\
+            --libexecdir=%{_libexecdir}		\
             --bindir=%{_bindir}			\
             --localstatedir=%{_localstatedir} 	\
             --with-dbus-user=root       	\
@@ -179,6 +184,8 @@
 %{_libdir}/python?.?/vendor-packages/*
 
 %changelog
+* Mon Aug 06 2007 - [email protected]
+- Bump to 0.74.  Update patches.
 * Fri Jun 08 2007 - [email protected]
 - Remove dbus-01-dbus-launch.diff since it is no longer needed now
   that we've reworked the SUNWdtlogin-integration package to call

--- a/patches/dbus-02-daemondir.diff	Mon Aug 06 23:26:54 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- dbus-1.0.2/dbus-1.pc.in-orig	2007-03-02 16:12:31.224891000 +0800
-+++ dbus-1.0.2/dbus-1.pc.in	2007-03-02 16:14:46.944051000 +0800
-@@ -5,6 +5,7 @@ includedir=@includedir@
- system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
- sysconfdir=@EXPANDED_SYSCONFDIR@
- session_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/services
-+daemondir=@DBUS_DAEMONDIR@
- 
- Name: dbus
- Description: Free desktop message bus

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dbus-02-fixconfigure.diff	Mon Aug 06 23:40:50 2007 +0000
@@ -0,0 +1,34 @@
+--- dbus-1.1.2/configure.in-orig	2007-08-06 16:20:10.499290000 -0500
++++ dbus-1.1.2/configure.in	2007-08-06 16:24:59.104651000 -0500
+@@ -243,31 +243,8 @@ else
+   fi
+ fi
+ 
+-# Check for -Wl,--gc-sections
+-AC_MSG_CHECKING([for ld that supports "-Wl,--gc-sections"])
+-AC_TRY_LINK([
+-  int one(void) { return 1; }
+-  int two(void) { return 2; }
+-  ], [ two(); ] , [ac_gcsections=yes], [ac_gcsections=no])
+-
+-if test "$ac_gcsections" = "yes"; then
+-  rm -f conftest.c
+-  touch conftest.c
+-  if $CC -c conftest.c; then
+-    if $LD --gc-sections -o conftest conftest.o 2>&1 | \
+-      grep "Warning: gc-sections option ignored" > /dev/null; then
+-      ac_gcsections=no
+-    fi
+-  fi
+-  rm -f conftest.c conftest.o conftest
+-fi
+-if test "$ac_gcsections" = "yes"; then
+-  SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
+-  CFLAGS="-ffunction-sections -fdata-sections $CFLAGS"
+-fi
+ AC_SUBST(SECTION_FLAGS)
+ AC_SUBST(SECTION_LDFLAGS)
+-AC_MSG_RESULT($ac_gcsections)
+ 
+ # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris
+ #

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dbus-03-clearenv.diff	Mon Aug 06 23:40:50 2007 +0000
@@ -0,0 +1,34 @@
+--- dbus-1.1.2/configure.in-orig	2007-08-06 17:03:36.854844000 -0500
++++ dbus-1.1.2/configure.in	2007-08-06 17:03:49.244110000 -0500
+@@ -534,7 +534,7 @@ fi
+ AC_CHECK_LIB(socket,socket)
+ AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
+ 
+-AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist fpathconf setrlimit)
++AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit)
+ 
+ AC_MSG_CHECKING(for dirfd)
+ AC_TRY_LINK([
+--- dbus-1.1.2/dbus/dbus-sysdeps.c-orig	2007-08-06 16:32:12.631749000 -0500
++++ dbus-1.1.2/dbus/dbus-sysdeps.c	2007-08-06 17:04:26.716379000 -0500
+@@ -185,7 +185,19 @@ _dbus_getenv (const char *varname)
+ dbus_bool_t
+ _dbus_clearenv (void)
+ {
+-  return (clearenv () == 0);
++  dbus_bool_t rc = TRUE;
++
++#ifdef HAVE_CLEARENV
++  if (clearenv () != 0)
++     rc = FALSE;
++#else
++        extern char **environ;
++
++        if (environ != NULL)
++                environ[0] = NULL;
++#endif
++
++  return rc;
+ }
+ 
+ /*