From 34acbd44f498a375c33af1f23fc4c80282b003491b0c5ba00ab2c21f07ae31cb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 21 Feb 2022 08:10:21 +0000 Subject: [PATCH] Accepting request 956097 from home:iznogood:branches:security - Conditionally drop optional gconf2-devel BuildRequires for openSUSE Tumbleweed and newer: gconf2 is being droppped from openSUSE Tumbleweed, build without gconf2 support. OBS-URL: https://build.opensuse.org/request/show/956097 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=272 --- openscap.changes | 7 +++++++ openscap.spec | 2 ++ 2 files changed, 9 insertions(+) diff --git a/openscap.changes b/openscap.changes index ee83943..9f9db3b 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 19 13:46:06 UTC 2022 - Bjørn Lie + +- Conditionally drop optional gconf2-devel BuildRequires for + openSUSE Tumbleweed and newer: gconf2 is being droppped from + openSUSE Tumbleweed, build without gconf2 support. + ------------------------------------------------------------------- Thu Jan 20 08:43:41 UTC 2022 - Robert Frohl diff --git a/openscap.spec b/openscap.spec index 1db193d..548e18d 100644 --- a/openscap.spec +++ b/openscap.spec @@ -50,7 +50,9 @@ BuildRequires: cmake BuildRequires: dbus-1-devel BuildRequires: doxygen BuildRequires: gcc-c++ +%if 0%{?suse_version} < 1550 BuildRequires: gconf2-devel +%endif BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: libblkid-devel