From 10c00e73cf23eb1a15dea3737c0d3c974ef21141fe716364d6b2dd8f34b1c5c9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 26 Oct 2012 14:57:16 +0000 Subject: [PATCH] Accepting request 139456 from openSUSE:Factory:Staging:Systemd - remove sysvinit requires from the package - remove %run_permissions macro - baselibs: dbus-1-devel-32bit must require libdbus-1-3-32bit - remove sysvinit requires from the package - remove %run_permissions macro OBS-URL: https://build.opensuse.org/request/show/139456 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=101 --- dbus-1-x11.changes | 11 +++++++++++ dbus-1.changes | 6 ++++++ dbus-1.spec | 6 ++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index ded5c79..efdbcd0 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 26 06:07:21 UTC 2012 - coolo@suse.com + +- remove sysvinit requires from the package +- remove %run_permissions macro + +------------------------------------------------------------------- +Wed Oct 24 21:11:19 UTC 2012 - jengelh@inai.de + +- baselibs: dbus-1-devel-32bit must require libdbus-1-3-32bit + ------------------------------------------------------------------- Sun Oct 7 16:57:56 UTC 2012 - coolo@suse.com diff --git a/dbus-1.changes b/dbus-1.changes index 03cbdbb..efdbcd0 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 26 06:07:21 UTC 2012 - coolo@suse.com + +- remove sysvinit requires from the package +- remove %run_permissions macro + ------------------------------------------------------------------- Wed Oct 24 21:11:19 UTC 2012 - jengelh@inai.de diff --git a/dbus-1.spec b/dbus-1.spec index fe13447..43bb0fc 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -66,7 +66,10 @@ BuildRequires: libselinux-devel BuildRequires: libcap-ng-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END -PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd /sbin/insserv /etc/init.d/boot.localfs +%if 0%{?suse_version} < 1230 +PreReq: /sbin/insserv /etc/init.d/boot.localfs +%endif +PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd %package -n %{_libname} @@ -209,7 +212,6 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id /bin/dbus-uuidgen --ensure %{insserv_force_if_yast dbus} /sbin/ldconfig -%{run_permissions} %verifyscript %verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper