Upgrade to 1.2.1

backport-Updated-the-build-system-to-use-pytest-for-tests.patch

@@ -1,28 +0,0 @@
-From 573440fc7dce774e1f695470b2387d84aaf85352 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
-Date: Thu, 21 Jun 2018 10:50:07 +0200
-Subject: [PATCH] Updated the build system to use pytest for tests.
-
----
- Makefile                         | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 32a3420..4676e2e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -88,11 +88,11 @@ test:
- 	@find . -name '*.py' -print|xargs -n1 --max-procs=$(NUM_PROCS) pylint$(PYVERSION) -E 2> /dev/null
- 	@echo "[ OK ]"
- 	@echo "***Running unittests checks***"
--	@PYTHONPATH=. nosetests$(PYVERSION) --processes=-1 -vw tests/
-+	@PYTHONPATH=. py.test$(PYVERSION) --processes=-1 -vw tests/
- 
- runpylint:
- 	@find . -name '*.py' -print|xargs -n1 --max-procs=$(NUM_PROCS) pylint$(PYVERSION) -E 2> /dev/null
- 	@echo "[ OK ]"
- 
- unittest:
--	PYTHONPATH=. nosetests$(PYVERSION) --processes=-1 -vw tests/
-+	PYTHONPATH=. py.test$(PYVERSION) -v tests/
-

oscap-anaconda-addon-Bumped-the-schematron-version-to-match-the-SCAP-version.patch

@@ -1,20 +0,0 @@
-From 7541e71fe681e3df3255cda4aeb5fa3fe3be40c8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
-Date: Mon, 25 May 2020 11:50:06 +0200
-Subject: [PATCH] Bumped the schematron version to match the SCAP version.
-
----
- testing_files/testing_ds.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testing_files/testing_ds.xml b/testing_files/testing_ds.xml
-index d2e5bba..d7312f0 100644
---- a/testing_files/testing_ds.xml
-+++ b/testing_files/testing_ds.xml
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<ds:data-stream-collection xmlns:ds="http://scap.nist.gov/schema/scap/source/1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog" id="scap_org.open-scap_collection_from_xccdf_first-xccdf.xml" schematron-version="1.0">
-+<ds:data-stream-collection xmlns:ds="http://scap.nist.gov/schema/scap/source/1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog" id="scap_org.open-scap_collection_from_xccdf_first-xccdf.xml" schematron-version="1.2">
-   <ds:data-stream id="scap_org.open-scap_datastream_tst" scap-version="1.2" use-case="OTHER">
-     <ds:checklists>
-       <ds:component-ref id="scap_org.open-scap_cref_first-xccdf.xml"

oscap-anaconda-addon.spec

@@ -1,15 +1,11 @@
 Name:                oscap-anaconda-addon
-Version:             1.0
+Version:             1.2.1
-Release:             4
+Release:             1
 Summary:             Anaconda addon integrating OpenSCAP to the installation process
 License:             GPLv2+
 URL:                 https://github.com/OpenSCAP/oscap-anaconda-addon
 Source0:             https://github.com/OpenSCAP/%{name}/releases/download/r%{version}/%{name}-%{version}.tar.gz
 
-# Fix check fail
-Patch0001:           oscap-anaconda-addon-Bumped-the-schematron-version-to-match-the-SCAP-version.patch
-Patch0002:           backport-Updated-the-build-system-to-use-pytest-for-tests.patch
-
 BuildArch:           noarch
 BuildRequires:       gettext python3-devel python3-pycurl python3-mock python3-pytest python3-cpio
 BuildRequires:       openscap openscap-utils openscap-python3 anaconda >= 28.22
@@ -36,6 +32,9 @@ make install DESTDIR=%{buildroot}
 %doc COPYING ChangeLog README.md
 
 %changelog
+* Wed Oct 25 2023 yaoxin <yao_xin001@hoperun.com> - 1.2.1-1
+- Upgrade to 1.2.1
+
 * Sat May 07 2022 gaihuiying <eaglegai@163.com> - 1.0-4
 - Updated the build system to use pytest for tests