Accepting request 750036 from home:StefanBruens:branches:Base:System

- Fix two inconsistencies with _libexecdir, sysusers.d and
  tmpfiles.d are always in %{_prefix}/lib/.
- Drop update-desktop-files BuildRequires, once added for
  mimetypes.prov which is no longer part of update-desktop-files,
  and dbus-1.desktop does not even handles a single mimetype.

OBS-URL: https://build.opensuse.org/request/show/750036
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=285
This commit is contained in:
Simon Lees 2019-11-21 03:04:57 +00:00 committed by Git OBS Bridge
parent 7b48e6ed74
commit 61719e7394
4 changed files with 34 additions and 8 deletions

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Nov 20 20:09:53 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix two inconsistencies with _libexecdir, sysusers.d and
tmpfiles.d are always in %{_prefix}/lib/.
- Drop update-desktop-files BuildRequires, once added for
mimetypes.prov which is no longer part of update-desktop-files,
and dbus-1.desktop does not even handles a single mimetype.
-------------------------------------------------------------------
Wed May 29 13:25:43 UTC 2019 - Simon Lees <sflees@suse.de>
- Replace DISABLE_RESTART_ON_UPDATE with
%service_del_postun_without_restart
- Remove version specific code to block all updates on restart as
hopefully no tumbleweed versions still have code causing those
issues (was only present for a few snapshots)
-------------------------------------------------------------------
Wed Apr 24 09:27:11 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package dbus-1-x11
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Nov 20 20:09:53 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix two inconsistencies with _libexecdir, sysusers.d and
tmpfiles.d are always in %{_prefix}/lib/.
- Drop update-desktop-files BuildRequires, once added for
mimetypes.prov which is no longer part of update-desktop-files,
and dbus-1.desktop does not even handles a single mimetype.
-------------------------------------------------------------------
Wed May 29 13:25:43 UTC 2019 - Simon Lees <sflees@suse.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package dbus-1
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -53,7 +53,6 @@ BuildRequires: libexpat-devel >= 2.1.0
BuildRequires: libtool
BuildRequires: permissions
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: xmlto
BuildRequires: pkgconfig(libsystemd) >= 209
Requires(post): %{_libname} = %{version}
@ -226,7 +225,7 @@ fi
%set_permissions %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch %{_bindir}/dbus-launch.nox11 10
%service_add_post dbus.service dbus.socket
%tmpfiles_create %{_tmpfilesdir}/dbus.conf
%tmpfiles_create %{_prefix}/lib/tmpfiles.d/dbus.conf
%preun
if [ "$1" = 0 ] ; then
@ -287,12 +286,12 @@ fi
%attr(4750,root,messagebus) %verify(not mode) %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
%ghost /run/dbus
%ghost %{_localstatedir}/lib/dbus/machine-id
%{_libexecdir}/sysusers.d/dbus.conf
%{_libexecdir}/tmpfiles.d/dbus.conf
%{_prefix}/lib/sysusers.d/dbus.conf
%{_prefix}/lib/tmpfiles.d/dbus.conf
%{_unitdir}/dbus.service
%{_unitdir}/dbus.socket
# %dir %{_unitdir}/dbus.target.wants
# %{_unitdir}/dbus.target.wants/dbus.socket
# %%dir %%{_unitdir}/dbus.target.wants
# %%{_unitdir}/dbus.target.wants/dbus.socket
%dir %{_unitdir}/multi-user.target.wants
%{_unitdir}/multi-user.target.wants/dbus.service
%dir %{_unitdir}/sockets.target.wants