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 2025-03-25 22:09:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scap-security-guide (Old)
and /work/SRC/openSUSE:Factory/.scap-security-guide.new.2696 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scap-security-guide"
Tue Mar 25 22:09:27 2025 rev:40 rq:1255397 version:0.1.76
Changes:
--------
--- /work/SRC/openSUSE:Factory/scap-security-guide/scap-security-guide.changes
2025-03-11 20:47:52.660614492 +0100
+++
/work/SRC/openSUSE:Factory/.scap-security-guide.new.2696/scap-security-guide.changes
2025-03-25 22:17:40.471696427 +0100
@@ -1,0 +2,11 @@
+Sun Mar 23 10:12:12 UTC 2025 - Marcus Meissner <meiss...@suse.com>
+
+- ssg-fix-python.patch: fix build with older python3.
+
+-------------------------------------------------------------------
+Sat Mar 22 18:02:02 UTC 2025 - Shawn Dunn <sfal...@opensuse.org>
+
+- Add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to fix FTBFS with cmake4
+- Remove Group: declarations, no longer used
+
+-------------------------------------------------------------------
New:
----
ssg-fix-python.patch
BETA DEBUG BEGIN:
New:
- ssg-fix-python.patch: fix build with older python3.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scap-security-guide.spec ++++++
--- /var/tmp/diff_new_pack.OTJgCr/_old 2025-03-25 22:17:41.063720937 +0100
+++ /var/tmp/diff_new_pack.OTJgCr/_new 2025-03-25 22:17:41.063720937 +0100
@@ -46,12 +46,12 @@
Release: 0
Summary: XCCDF files for SUSE Linux and openSUSE
License: BSD-3-Clause
-Group: Productivity/Security
URL: https://github.com/ComplianceAsCode/content
%if "%{_vendor}" == "debbuild"
Packager: SUSE Security Team <secur...@suse.de>
%endif
Source:
https://github.com/ComplianceAsCode/content/archive/v%{version}.tar.gz
+Patch0: ssg-fix-python.patch
# explicit require what is needed by the detection logic in the scripts
Requires: coreutils
@@ -62,7 +62,7 @@
Requires: sudo
Requires: zypper
-BuildRequires: cmake
+BuildRequires: cmake >= 3.5
%if "%{_vendor}" == "debbuild"
%{!?_licensedir:%global license %%doc}
@@ -162,7 +162,6 @@
%package redhat
Summary: XCCDF files for RHEL, CentOS, Fedora, ScientificLinux and
AlmaLinux
-Group: Productivity/Security
%if 0%{?fedora} || 0%{?rhel} || 0%{?alma}
Conflicts: scap-security-guide
%endif
@@ -179,7 +178,6 @@
%package debian
Summary: XCCDF files for Debian
-Group: Productivity/Security
%description debian
Security Content Automation Protocol (SCAP) Security Guide for Debian.
@@ -193,7 +191,6 @@
%package ubuntu
Summary: XCCDF files for Ubuntu
-Group: Productivity/Security
%description ubuntu
Security Content Automation Protocol (SCAP) Security Guide for Ubuntu.
@@ -207,6 +204,7 @@
%prep
%setup -q -n content-%version
+%patch -P 0 -p 1
%build
cd build
@@ -255,6 +253,7 @@
-DSSG_PRODUCT_WRLINUX1019=OFF \
-DSSG_PRODUCT_ANOLIS8=OFF \
-DSSG_PRODUCT_ANOLIS23=OFF \
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
../
make
++++++ ssg-fix-python.patch ++++++
Index: content-0.1.76/ssg/jinja.py
===================================================================
--- content-0.1.76.orig/ssg/jinja.py
+++ content-0.1.76/ssg/jinja.py
@@ -255,7 +255,7 @@ def _load_macros(macros_directory, subst
add_python_functions(substitutions_dict)
if not os.path.isdir(macros_directory):
- msg = (f"The directory '{macros_directory}' does not exist.")
+ msg = ("The directory '{1}' does not exist.").format(macros_directory)
raise RuntimeError(msg)
_load_macros_from_directory(macros_directory, substitutions_dict)
