Hello community, here is the log from the commit of package openlmi-providers for openSUSE:Factory checked in at 2017-06-22 10:40:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openlmi-providers (Old) and /work/SRC/openSUSE:Factory/.openlmi-providers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openlmi-providers" Thu Jun 22 10:40:32 2017 rev:8 rq:505493 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openlmi-providers/openlmi-providers.changes 2015-04-02 16:03:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openlmi-providers.new/openlmi-providers.changes 2017-06-22 10:40:35.427952248 +0200 @@ -1,0 +2,9 @@ +Wed Jun 21 11:31:31 UTC 2017 - dimstar@opensuse.org + +- Add openlmi-systemd-231.patch, conditionally applied for + systemd >= 231: libsystemd-journald has been merged into the main + library. +- Do not add patches conditionally to the .src.rpm file, but only + apply them conditionally (making src.rpm reusable). + +------------------------------------------------------------------- New: ---- openlmi-systemd-231.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openlmi-providers.spec ++++++ --- /var/tmp/diff_new_pack.etsQ3I/_old 2017-06-22 10:40:36.123854133 +0200 +++ /var/tmp/diff_new_pack.etsQ3I/_new 2017-06-22 10:40:36.127853569 +0200 @@ -1,7 +1,7 @@ # # spec file for package openlmi-providers # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Redhat, Inc # # All modifications and additions to the file contributed by third parties @@ -117,7 +117,6 @@ Source1: http://docs.openlmi.org/en/latest/objects.inv %endif -%if 0%{?suse_version} # PATCH-FIX-OPENSUSE, no libexec in SUSE, kkaempf@suse.de Patch1: 0001-cimprovagt-is-under-usr-lib-pegasus-on-SUSE.patch # PATCH-FIX-OPENSUSE, run dmidecode with full path, kkaempf@suse.de @@ -128,7 +127,7 @@ Patch4: 0004-Install-service-scripts-to-usr-share-openlmi-provide.patch # PATCH-FIX-OPENSUSE, default SystemCreationClassName to Linux_ComputerSystem for sfcb, kkaempf@suse.de Patch5: 0005-Default-SystemCreationClassName-to-Linux_ComputerSys.patch -%endif +Patch6: openlmi-systemd-231.patch # Upstream name has been changed from cura-providers to openlmi-providers Provides: cura-providers = %{version}-%{release} @@ -631,6 +630,9 @@ %patch4 -p1 %patch5 -p1 %endif +if pkg-config --atleast-version=231 libsystemd; then +%patch6 -p1 +fi %build %if 0%{offline_build} ++++++ openlmi-systemd-231.patch ++++++ Index: openlmi-providers-0.6.0/src/journald/CMakeLists.txt =================================================================== --- openlmi-providers-0.6.0.orig/src/journald/CMakeLists.txt +++ openlmi-providers-0.6.0/src/journald/CMakeLists.txt @@ -1,5 +1,5 @@ pkg_check_modules(GLIB2 glib-2.0 REQUIRED) -pkg_check_modules(SYSTEMD-JOURNAL libsystemd-journal REQUIRED) +pkg_check_modules(SYSTEMD-JOURNAL libsystemd REQUIRED) set(PROVIDER_NAME Journald) set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME})