3 changed files with 5 additions and 55 deletions
--- a/1.3.3.tar.gz
+++ b/1.3.3.tar.gz
--- a/openscap-1.3.9-includes.patch
+++ b/openscap-1.3.9-includes.patch
@ -1,33 +0,0 @@
-diff -ru openscap-1.3.9/src/common/xml_iterate.c openscap-1.3.9.new/src/common/xml_iterate.c
--- openscap-1.3.9/src/common/xml_iterate.c	2023-09-06 16:04:46.000000000 +0200
-+++ openscap-1.3.9.new/src/common/xml_iterate.c	2023-11-27 03:13:21.931933518 +0100
-@@ -22,6 +22,7 @@
- #endif
- 
- #include <string.h>
-+#include <libxml/parser.h>
- #include "debug_priv.h"
- #include "xml_iterate.h"
- #include "oscap_helpers.h"
-diff -ru openscap-1.3.9/src/OVAL/results/oval_cmp_evr_string.c openscap-1.3.9.new/src/OVAL/results/oval_cmp_evr_string.c
--- openscap-1.3.9/src/OVAL/results/oval_cmp_evr_string.c	2023-09-06 16:04:46.000000000 +0200
-+++ openscap-1.3.9.new/src/OVAL/results/oval_cmp_evr_string.c	2023-11-27 03:18:23.003882498 +0100
-@@ -30,6 +30,7 @@
- #include <math.h>
- #include <string.h>
- #include <ctype.h>
-+#include <limits.h>
- #include "oval_cmp_evr_string_impl.h"
- #include "oval_definitions.h"
- #include "oval_types.h"
-diff -ru openscap-1.3.9/src/source/bz2.c openscap-1.3.9.new/src/source/bz2.c
--- openscap-1.3.9/src/source/bz2.c	2023-09-06 16:04:46.000000000 +0200
-+++ openscap-1.3.9.new/src/source/bz2.c	2023-11-27 03:32:20.069323771 +0100
-@@ -26,6 +26,7 @@
- #endif
- 
- #include <libxml/tree.h>
-+#include <libxml/parser.h>
- #include <stdlib.h>
- #include <string.h>
- #ifdef OS_WINDOWS
--- a/openscap.spec
+++ b/openscap.spec
@ -1,21 +1,19 @@
 Name:                      openscap
-Version:                   1.3.9
-Release:                   3
+Version:                   1.3.3
+Release:                   2
 Summary:                   An open source framework in order to provide a interface for using scap
 License:                   LGPLv2+
 URL:                       http://www.open-scap.org
 Source0:                   https://github.com/OpenSCAP/openscap/archive/%{version}.tar.gz
-Patch0:                    openscap-1.3.9-includes.patch
 BuildRequires:             cmake >= 2.6 gcc gcc-c++ swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser
-BuildRequires:             rpm-devel libgcrypt-devel pcre2-devel libacl-devel libselinux-devel libcap-devel libblkid-devel
+BuildRequires:             rpm-devel libgcrypt-devel pcre-devel libacl-devel libselinux-devel libcap-devel libblkid-devel
 BuildRequires:             bzip2-devel asciidoc openldap-devel GConf2-devel dbus-devel chrpath libcurl-devel >= 7.12.0
-BuildRequires:             make glib2-devel libyaml-devel xmlsec1-devel xmlsec1-openssl-devel

 %if %{?_with_check:1}%{!?_with_check:0}
 BuildRequires:             perl-XML-XPath bzip2
 %endif

-Requires:                  libcurl >= 7.12.0 rpmdevtools rpm-build python3-docker
+Requires:                  libcurl >= 7.12.0 rpmdevtools rpm-build

 Provides:                  %{name}-scanner = %{version}-%{release} %{name}-utils = %{version}-%{release}
 Provides:                  %{name}-engine-sce = %{version}-%{release} %{name}-containers = %{version}-%{release}
@ -70,7 +68,7 @@ mkdir -p build

 %build
 cd build
-%cmake -DWITH_PCRE2=ON -DENABLE_DOCS=ON ..
+%cmake -DENABLE_DOCS=ON ..
 %make_build
 make docs

@ -141,21 +139,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*

 %changelog
-* Mon Mar 4 2024 liyanan <liyanan61@h-partners.com> - 1.3.9-3
- fix implicit declarations due to missing include
-
-* Mon Jan 29 2024 yaoxin <yao_xin001@hoperun.com> - 1.3.9-2
- Port pcre dependency to pcre2
-
-* Wed Jan 10 2024 liyanan <liyanan61@h-partners.com> - 1.3.9-1
- Update to version 1.3.9
-
-* Fri Feb 03 2023 wangkai <wangkai385@h-partners.com> - 1.3.7-1
- Update to version 1.3.7
-
-* Tue May 17 2022 wulei <wulei80@h-partners.com> - 1.3.6-1
- Update package
-
 * Mon Sep 13 2021 chenchen <chen_aka_jan@163.com> - 1.3.3-2
 - del rpath for some binaries and bin