From 7bd2317d01696fd5e5181dbf18d4f80b81d3eeb3539b6eff57848a52c3f6cd30 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 7 Apr 2021 22:36:23 +0000 Subject: [PATCH] - avoid listing cmake directory - owned by cmake package OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=302 --- dbus-1-devel-doc.spec | 4 ++-- dbus-1-x11.spec | 6 +++--- dbus-1.changes | 5 +++++ dbus-1.spec | 10 ++++++---- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dbus-1-devel-doc.spec b/dbus-1-devel-doc.spec index 0d6e4b9..45c6e7f 100644 --- a/dbus-1-devel-doc.spec +++ b/dbus-1-devel-doc.spec @@ -1,7 +1,7 @@ # # spec file for package dbus-1-devel-doc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Name: dbus-1-devel-doc Version: 1.12.20 Release: 0 Summary: Developer documentation package for D-Bus -License: GPL-2.0-or-later OR AFL-2.1 +License: AFL-2.1 OR GPL-2.0-or-later URL: https://dbus.freedesktop.org/ Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index 817fb5a..cd02f4f 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -1,7 +1,7 @@ # # spec file for package dbus-1-x11 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Name: dbus-1-x11 Version: 1.12.20 Release: 0 Summary: D-Bus Message Bus System -License: GPL-2.0-or-later OR AFL-2.1 +License: AFL-2.1 OR GPL-2.0-or-later URL: https://dbus.freedesktop.org/ Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc @@ -46,7 +46,7 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(x11) Requires(post): update-alternatives -Requires(preun): update-alternatives +Requires(preun):update-alternatives Supplements: (dbus-1 and libX11-6) Provides: dbus-launch %if %{with selinux} diff --git a/dbus-1.changes b/dbus-1.changes index b747d8f..4183f43 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 7 22:35:58 UTC 2021 - Dirk Müller + +- avoid listing cmake directory - owned by cmake package + ------------------------------------------------------------------- Fri Dec 4 07:50:57 UTC 2020 - Ludwig Nussel diff --git a/dbus-1.spec b/dbus-1.spec index eaeb303..7bbd57c 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -1,7 +1,7 @@ # # spec file for package dbus-1 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Name: dbus-1 Version: 1.12.20 Release: 0 Summary: D-Bus Message Bus System -License: GPL-2.0-or-later OR AFL-2.1 +License: AFL-2.1 OR GPL-2.0-or-later URL: https://dbus.freedesktop.org/ Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc @@ -38,6 +38,7 @@ Patch1: feature-suse-do-autolaunch.patch # Patch-Feature-opensuse sflees@suse.de, users shouldn't be allowed to start / stop the dbus service. Patch2: feature-suse-refuse-manual-start-stop.patch BuildRequires: audit-devel +BuildRequires: cmake BuildRequires: libcap-ng-devel BuildRequires: libexpat-devel >= 2.1.0 BuildRequires: permissions @@ -50,7 +51,7 @@ Requires(post): %{_libname} = %{version} Requires(post): update-alternatives Requires(post): diffutils Requires(pre): permissions -Requires(preun): update-alternatives +Requires(preun):update-alternatives Provides: dbus-launch %sysusers_requires %if %{with selinux} @@ -172,6 +173,7 @@ rm -Rf %{buildroot}%{_datadir}/doc/dbus %post -n %{_libname} -p /sbin/ldconfig %postun -n %{_libname} -p /sbin/ldconfig + %pre -f messagebus.pre %service_add_pre dbus.service dbus.socket @@ -280,7 +282,7 @@ fi %dir %{_libdir}/dbus-1.0 %{_libdir}/dbus-1.0/include %{_libdir}/pkgconfig/dbus-1.pc -%{_libdir}/cmake/ +%{_libdir}/cmake/DBus1 %{_datadir}/xml/dbus-1 %changelog