Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scap-security-guide for
openSUSE:Factory checked in at 2021-02-26 22:00:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scap-security-guide (Old)
and /work/SRC/openSUSE:Factory/.scap-security-guide.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scap-security-guide"
Fri Feb 26 22:00:06 2021 rev:2 rq:875317 version:0.1.54
Changes:
--------
--- /work/SRC/openSUSE:Factory/scap-security-guide/scap-security-guide.changes
2021-02-22 14:40:04.836599046 +0100
+++
/work/SRC/openSUSE:Factory/.scap-security-guide.new.2378/scap-security-guide.changes
2021-02-26 22:00:08.699857368 +0100
@@ -1,0 +2,5 @@
+Fri Feb 26 08:45:24 UTC 2021 - Marcus Meissner <[email protected]>
+
+- remove redhat conflict.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scap-security-guide.spec ++++++
--- /var/tmp/diff_new_pack.j7C7zf/_old 2021-02-26 22:00:09.323857915 +0100
+++ /var/tmp/diff_new_pack.j7C7zf/_new 2021-02-26 22:00:09.327857919 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package openscap-content-stig
+# spec file for package scap-security-guide
#
-# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,9 +12,10 @@
# 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/
#
+
%if ! (0%{?fedora} || 0%{?rhel} > 5)
%if "%{_vendor}" == "debbuild"
%global __python /usr/bin/python3
@@ -43,14 +44,12 @@
Name: scap-security-guide
Version: 0.1.54
Release: 0
-License: BSD-3-Clause
Summary: XCCDF files for SUSE Linux and openSUSE
-Url: https://github.com/ComplianceAsCode/content
+License: BSD-3-Clause
+Group: Productivity/Security
+URL: https://github.com/ComplianceAsCode/content
%if "%{_vendor}" == "debbuild"
-Packager: Uyuni packagers <[email protected]>
-Group: admin
%else
-Group: Productivity/Security
%endif
Source:
https://github.com/ComplianceAsCode/content/archive/v%{version}.tar.gz
BuildRequires: cmake
@@ -58,8 +57,8 @@
%if "%{_vendor}" == "debbuild"
%{!?_licensedir:%global license %%doc}
BuildRequires: libopenscap8
-BuildRequires: libxslt1.1
BuildRequires: libxml2-utils
+BuildRequires: libxslt1.1
BuildRequires: xsltproc
%else
BuildRequires: libxslt
@@ -102,8 +101,8 @@
%endif
%endif
-BuildRequires: libxml2
BuildRequires: expat
+BuildRequires: libxml2
# not on SLES currently
%if 0%{?is_opensuse} || 0%{?fedora} || "%{_vendor}" == "debbuild"
BuildRequires: ansible
@@ -120,8 +119,8 @@
files to run a compliance test on SLE12, SLE15 and openSUSE
%package redhat
-Conflicts: scap-security-guide
Summary: XCCDF files for RHEL, CentOS, Fedora and ScientificLinux
+Group: Productivity/Security
%description redhat
Security Content Automation Protocol (SCAP) Security Guide for
Redhat/Fedora/CentOS/OracleLinux/ScientificLinux.
@@ -133,6 +132,7 @@
%package debian
Summary: XCCDF files for Debian
+Group: Productivity/Security
%description debian
Security Content Automation Protocol (SCAP) Security Guide for Debian.
@@ -144,6 +144,7 @@
%package ubuntu
Summary: XCCDF files for Ubuntu
+Group: Productivity/Security
%description ubuntu
Security Content Automation Protocol (SCAP) Security Guide for Ubuntu.
@@ -256,7 +257,6 @@
%{_datadir}/xml/scap/ssg/content/*-centos*
%{_datadir}/xml/scap/ssg/content/*-sl7*
-
%files debian
%if "%{_vendor}" != "debbuild"
%license LICENSE
