From cac5ac42919386f2f4c4b1cd2d7f5cbf9457fcb82ece7d10f27d120e5465b1fc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 9 Jan 2017 10:51:37 +0000 Subject: [PATCH] Manual merge the systemd fix to unblock system v232 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=335 --- xorg-x11-server.changes | 8 ++++++++ xorg-x11-server.spec | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 4ae97a3..c4245a4 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 12 17:20:06 UTC 2016 - fbui@suse.com + +- Replace pkgconfig(libsystemd-*) with pkgconfig(libsystemd) + + Nowadays pkgconfig(libsystemd) replaces all libsystemd-* libs, which + are obsolete. + ------------------------------------------------------------------- Sat Nov 5 21:40:57 UTC 2016 - zaitor@opensuse.org diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 8651cc4..56c42a6 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-server # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -89,7 +89,7 @@ BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(inputproto) >= 1.9.99.902 BuildRequires: pkgconfig(kbproto) >= 1.0.3 BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 BuildRequires: pkgconfig(pixman-1) >= 0.24