From 41836fe8adb36c213c6200b8be9cf360706af37e Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: May 12 2008 17:12:40 +0000
Subject: - ensure uuid is created at post time


---

diff --git a/dbus-1.2.1-regenerate-uuid.patch b/dbus-1.2.1-regenerate-uuid.patch
new file mode 100644
index 0000000..e54e856
--- /dev/null
+++ b/dbus-1.2.1-regenerate-uuid.patch
@@ -0,0 +1,29 @@
+diff -up dbus-1.2.1/bus/Makefile.am.regenerate-uuid dbus-1.2.1/bus/Makefile.am
+diff -up dbus-1.2.1/bus/messagebus.in.regenerate-uuid dbus-1.2.1/bus/messagebus.in
+--- dbus-1.2.1/bus/messagebus.in.regenerate-uuid	2008-05-12 12:14:14.000000000 -0400
++++ dbus-1.2.1/bus/messagebus.in	2008-05-12 12:16:16.000000000 -0400
+@@ -35,6 +35,10 @@ RETVAL=0
+ start() {
+     echo -n $"Starting system message bus: "
+     if [ -x @EXPANDED_BINDIR@/dbus-uuidgen ] ; then
++        if [ -f @EXPANDED_LOCALSTATEDIR@/lib/dbus/.regenerate-uuid ]; then
++                rm -f @EXPANDED_LOCALSTATEDIR@/lib/dbus/machine-id
++                rm -f @EXPANDED_LOCALSTATEDIR@/lib/dbus/.regenerate-uuid
++        fi
+         @EXPANDED_BINDIR@/dbus-uuidgen --ensure
+     fi
+ 
+diff -up dbus-1.2.1/bus/rc.messagebus.in.regenerate-uuid dbus-1.2.1/bus/rc.messagebus.in
+--- dbus-1.2.1/bus/rc.messagebus.in.regenerate-uuid	2008-05-12 12:15:47.000000000 -0400
++++ dbus-1.2.1/bus/rc.messagebus.in	2008-05-12 12:16:14.000000000 -0400
+@@ -25,6 +25,10 @@
+ start() {
+     echo "Starting system message bus"
+     if [ -x @EXPANDED_BINDIR@/dbus-uuidgen ] ; then
++        if [ -f @EXPANDED_LOCALSTATEDIR@/lib/dbus/.regenerate-uuid ]; then
++                rm -f @EXPANDED_LOCALSTATEDIR@/lib/dbus/machine-id
++                rm -f @EXPANDED_LOCALSTATEDIR@/lib/dbus/.regenerate-uuid
++        fi
+         @EXPANDED_BINDIR@/dbus-uuidgen --ensure
+     fi
+ 
diff --git a/dbus.spec b/dbus.spec
index c2a60e2..c3b23f7 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -39,6 +39,7 @@ Conflicts: cups < 1:1.1.20-4
 
 Patch0: dbus-0.60-start-early.patch
 Patch1: dbus-1.0.1-generate-xml-docs.patch
+Patch2: dbus-1.2.1-regenerate-uuid.patch
 
 %description
 
@@ -94,6 +95,7 @@ in this separate package so server systems need not install X.
 
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
+%patch2 -p1 -b .regenerate-uuid
 
 autoreconf -f -i
 
@@ -156,6 +158,11 @@ rm -rf %{buildroot}
 /sbin/chkconfig --add messagebus 
 /sbin/chkconfig messagebus resetpriorities
 
+if [ ! -f %{_localstatedir}/lib/dbus/machine-id ]; then
+        dbus-uuidgen --ensure >& /dev/null ||:
+        touch %{_localstatedir}/lib/dbus/.regenerate-uuid
+fi
+
 %preun
 if [ $1 = 0 ]; then
     /sbin/service messagebus stop
@@ -164,6 +171,7 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
 
@@ -221,6 +229,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Mon May 12 2008 Ray Strode <rstrode@redhat.com> - 1.2.1-2
+- ensure uuid is created at post time
+
 * Fri Apr 04 2008 John (J5) Palmieri <johnp@redhat.com> - 1.2.1-1
 - update to latest upstream
 - major version change is really a maint release for 1.1.20