Accepting request 689029 from security

add missing obsoletes (forwarded request 688824 from rfrohl)

OBS-URL: https://build.opensuse.org/request/show/689029
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openscap?expand=0&rev=60

openscap.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Mar 26 13:55:18 UTC 2019 - Robert Frohl <rfrohl@suse.com>
+
+- obsolete removed packages: openscap-engine-sce and openscap-extra-probes
+
+-------------------------------------------------------------------
+Mon Mar 25 18:54:37 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- 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 <rfrohl@suse.com>
 

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
+# SUSE specific profile, based on yast2-security checks.
-# checks.
 # Generated from http://gitorious.org/test-suite/scap
 Source3:        scap-yast2sec-xccdf.xml
 Source4:        scap-yast2sec-oval.xml
@@ -62,7 +61,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,10 +79,15 @@ 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
 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