From 491045a433f0b6944c40b37160d99f3516a5193bdfdef98e0ca6ec42d056d28f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 27 Mar 2019 09:29:58 +0000 Subject: [PATCH 1/2] Accepting request 688437 from home:iznogood:branches:security - Drop gconf2-devel BuildRequires: It is not mandatory, so lets build without this obsolete package. - Add pkgconfig(glib-2.0) and pkgconfig(gobject-2.0) BuildRequires: They are also optional, but not obsolete, and previously pulled in via gconf2-devel dependency, so lets build support for them. OBS-URL: https://build.opensuse.org/request/show/688437 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=229 --- openscap.changes | 9 +++++++++ openscap.spec | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/openscap.changes b/openscap.changes index 02eb861..351d7ac 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Mar 25 18:54:37 UTC 2019 - Bjørn Lie + +- Drop gconf2-devel BuildRequires: It is not mandatory, so lets + build without this obsolete package. +- Add pkgconfig(glib-2.0) and pkgconfig(gobject-2.0) BuildRequires: + They are also optional, but not obsolete, and previously pulled + in via gconf2-devel dependency, so lets build support for them. + ------------------------------------------------------------------- Fri Oct 19 15:46:44 UTC 2018 - Robert Frohl diff --git a/openscap.spec b/openscap.spec index a488270..e7fa00d 100644 --- a/openscap.spec +++ b/openscap.spec @@ -62,7 +62,6 @@ BuildRequires: libxml2-devel # Use package name cause of "have choice for perl(XML::Parser): brp-check-suse perl-XML-Parser" BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: gconf2-devel BuildRequires: libblkid-devel BuildRequires: libcap-devel BuildRequires: libselinux-devel @@ -81,6 +80,8 @@ BuildRequires: rpm-devel BuildRequires: sendmail BuildRequires: swig BuildRequires: unixODBC-devel +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) Summary: A Set of Libraries for Integration with SCAP License: LGPL-2.1-or-later Group: Development/Tools/Other From 96f998b11f479eeaaa9326240acb040db3a39d73f06f7c499e45db12f433602c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 27 Mar 2019 09:30:35 +0000 Subject: [PATCH 2/2] Accepting request 688824 from home:rfrohl:branches:security add missing obsoletes OBS-URL: https://build.opensuse.org/request/show/688824 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=230 --- openscap.changes | 5 +++++ openscap.spec | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/openscap.changes b/openscap.changes index 351d7ac..f4d5995 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 26 13:55:18 UTC 2019 - Robert Frohl + +- obsolete removed packages: openscap-engine-sce and openscap-extra-probes + ------------------------------------------------------------------- Mon Mar 25 18:54:37 UTC 2019 - Bjørn Lie diff --git a/openscap.spec b/openscap.spec index e7fa00d..65165a6 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,7 +1,7 @@ # # spec file for package openscap # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -30,8 +30,7 @@ Release: 1.0 Source: https://github.com/OpenSCAP/openscap/archive/%{version}.tar.gz Source1: openscap-rpmlintrc Source2: sysconfig.oscap-scan -# SUSE specific profile, based on yast2-security -# checks. +# SUSE specific profile, based on yast2-security checks. # Generated from http://gitorious.org/test-suite/scap Source3: scap-yast2sec-xccdf.xml Source4: scap-yast2sec-oval.xml @@ -86,6 +85,9 @@ Summary: A Set of Libraries for Integration with SCAP License: LGPL-2.1-or-later Group: Development/Tools/Other BuildRequires: systemd-rpm-macros +# remove extra packages from version 1.2.9 and older +Obsoletes: openscap-engine-sce < %{version} +Obsoletes: openscap-extra-probes < %{version} %description OpenSCAP is a set of open source libraries providing an easier path for