From adb2892f0ee3de51f4531dbebdeab47880e8e2d7c9bc6fb045e6e5ff654f2bff Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 13 Dec 2016 14:20:06 +0000 Subject: [PATCH] Accepting request 445542 from home:dimstar:Factory - Replace pkgconfig(libsystemd-daemon) BuildRequires with pkgconfig(libsystemd) on openSUSE 13.2 and newer: the various sub-libraries have been merged into libsystemd since version 209. openSUSE 13.1 was the last product to ship systemd 208. NOTE: for SLE, this should also not break: SLE11 is disabled in Printing (and was not systemd based at all, so the old package already could not have worked); SLE12 GA already shipped systemd 210 (as did openSUSE 13.2). OBS-URL: https://build.opensuse.org/request/show/445542 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=321 --- cups.changes | 8 ++++++++ cups.spec | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/cups.changes b/cups.changes index 1b7fb3d..8b5a6cc 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 12 13:59:53 UTC 2016 - dimstar@opensuse.org + +- Replace pkgconfig(libsystemd-daemon) BuildRequires with + pkgconfig(libsystemd) on openSUSE 13.2 and newer: the various + sub-libraries have been merged into libsystemd since version 209. + openSUSE 13.1 was the last product to ship systemd 208. + ------------------------------------------------------------------- Tue Jun 28 10:43:40 UTC 2016 - kamikazow@web.de diff --git a/cups.spec b/cups.spec index 14df754..1c541e4 100644 --- a/cups.spec +++ b/cups.spec @@ -75,7 +75,11 @@ BuildRequires: libusb-1_0-devel BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: zlib-devel +%if 0%{?suse_version} > 1310 +BuildRequires: pkgconfig(libsystemd) +%else BuildRequires: pkgconfig(libsystemd-daemon) +%endif BuildRequires: pkgconfig(systemd) # Require the exact matching version-release of the cups-client and cups-libs # sub-package because because all CUPS software is built from the one same