rpms/dbus/devel dbus.spec, 1.144, 1.145 dbus-1.2.1-regenerate-uuid.patch, 1.1, NONE

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10193

Modified Files:
	dbus.spec 
Removed Files:
	dbus-1.2.1-regenerate-uuid.patch 
Log Message:
- drop last patch after discussion on dbus list



Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- dbus.spec	12 May 2008 17:12:40 -0000	1.144
+++ dbus.spec	12 May 2008 18:57:59 -0000	1.145
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?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,7 +39,6 @@
 
 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
 
@@ -95,7 +94,6 @@
 
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
-%patch2 -p1 -b .regenerate-uuid
 
 autoreconf -f -i
 
@@ -158,11 +156,6 @@
 /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
@@ -229,6 +222,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon May 12 2008 Ray Strode <rstrode at redhat.com> - 1.2.1-3
+- drop last patch after discussion on dbus list
+
 * Mon May 12 2008 Ray Strode <rstrode at redhat.com> - 1.2.1-2
 - ensure uuid is created at post time
 


--- dbus-1.2.1-regenerate-uuid.patch DELETED ---