rpms/dbus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- drop last patch after discussion on dbus list

Browse Source
This commit is contained in:
Ray Strode 2008-05-12 18:57:59 +00:00
parent 41836fe8ad
commit 3b360ba8c9
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dbus-1.2.1-regenerate-uuid.patch
View File

@ -1,29 +0,0 @@
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

12
dbus.spec
View File

@ -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 @@ 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
@ -95,7 +94,6 @@ 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
@ -158,11 +156,6 @@ 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
@ -229,6 +222,9 @@ fi
%{_includedir}/*
%changelog
* Mon May 12 2008 Ray Strode <rstrode@redhat.com> - 1.2.1-3
- drop last patch after discussion on dbus list
* Mon May 12 2008 Ray Strode <rstrode@redhat.com> - 1.2.1-2
- ensure uuid is created at post time