File dbus-1.spec.patch of Package dbus-1

diff --git dbus-1.spec dbus-1.spec.new
index 06125ec..3ab1592 100644
--- dbus-1.spec
+++ dbus-1.spec.new
@@ -51,14 +51,10 @@ BuildRequires:  pkgconfig
 BuildRequires:  sysuser-tools
 BuildRequires:  xmlto
 BuildRequires:  pkgconfig(libsystemd) >= 209
-Requires(post): %{_libname} = %{version}
-Requires(post): /usr/bin/cmp
 %if %{with selinux}
 BuildRequires:  libselinux-devel
 %endif
 Requires:       dbus-1-common >= %{version}
-# Later this should move to Recommends
-Requires:       dbus-1-tools >= %{version}
 Requires:       dbus-broker
 
 %package -n %{_libname}
@@ -68,6 +64,7 @@ Requires:       dbus-1-common >= %{version}
 
 %package common
 Summary:        D-BUS message bus configuration
+Requires(post): %{_libname} = %{version}
 BuildArch:      noarch
 %sysusers_requires
 
@@ -75,6 +72,8 @@ BuildArch:      noarch
 Summary:        D-Bus message bus daemon
 Provides:       dbus-1:%{_bindir}/dbus-daemon
 Provides:       dbus-launch = %{version}
+# Later this should move to Recommends
+Requires:       dbus-1-tools >= %{version}
 Requires(pre):  permissions
 
 %package devel
@@ -187,13 +186,13 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 rm -Rf %{buildroot}%{_datadir}/doc/dbus
 
-%verifyscript -n dbus-1
+%verifyscript daemon
 %verify_permissions -e %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
 
 %post -n %{_libname} -p /sbin/ldconfig
 %postun -n %{_libname} -p /sbin/ldconfig
 
-%pre
+%pre daemon
 %if %{with_service}
 %service_add_pre dbus.service
 %endif
@@ -206,13 +205,15 @@ fi
 
 %post
 /sbin/ldconfig
+
 %if %{with_service}
+%post daemon
 %service_add_post dbus.service
 
-%preun
+%preun daemon
 %service_del_preun dbus.service
 
-%postun
+%postun daemon
 %service_del_postun_without_restart dbus.service
 %endif
 
@@ -221,13 +222,7 @@ fi
 
 %post common
 if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then
-  cmp -s %{_localstatedir}/lib/dbus/machine-id %{_sysconfdir}/machine-id > /dev/null
-  if [ $? ]; then
-    rm -f %{_localstatedir}/lib/dbus/machine-id
-  fi
-fi
-if [ ! -L %{_localstatedir}/lib/dbus/machine-id ]; then
-  mkdir -p %{_localstatedir}/lib/dbus/
+  rm -f %{_localstatedir}/lib/dbus/machine-id
   ln -s %{_sysconfdir}/machine-id %{_localstatedir}/lib/dbus/machine-id
 fi
 %tmpfiles_create %{_prefix}/lib/tmpfiles.d/dbus.conf
@@ -243,17 +238,8 @@ fi
 %set_permissions %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
 
 %files
-%dir %{_libexecdir}/dbus-1/
 %license COPYING
 %doc AUTHORS NEWS README
-%if %{with_service}
-%{_unitdir}/dbus.service
-%endif
-%if %{with_service}
-%dir %{_unitdir}/multi-user.target.wants
-%{_unitdir}/multi-user.target.wants/dbus.service
-%{_userunitdir}/dbus.service
-%endif
 
 %files -n %{_libname}
 %{_libdir}/libdbus-1.so.*
@@ -290,6 +276,15 @@ fi
 %{_bindir}/dbus-launch
 %{_bindir}/dbus-run-session
 %{_bindir}/dbus-test-tool
+%if %{with_service}
+%{_unitdir}/dbus.service
+%endif
+%if %{with_service}
+%dir %{_unitdir}/multi-user.target.wants
+%{_unitdir}/multi-user.target.wants/dbus.service
+%{_userunitdir}/dbus.service
+%endif
+%dir %{_libexecdir}/dbus-1/
 %{_mandir}/man1/dbus-cleanup-sockets.1%{?ext_man}
 %{_mandir}/man1/dbus-daemon.1%{?ext_man}
 %{_mandir}/man1/dbus-launch.1%{?ext_man}