Fix-scap_workbench-builderror.patch

@@ -0,0 +1,29 @@
+diff -Nur openscap-1.3.2_old/src/OVAL/oval_variable.c openscap-1.3.2/src/OVAL/oval_variable.c
+--- openscap-1.3.2_old/src/OVAL/oval_variable.c	2020-03-11 04:30:50.534661136 -0400
++++ openscap-1.3.2/src/OVAL/oval_variable.c	2020-03-11 04:32:05.787195584 -0400
+@@ -156,11 +156,11 @@
+ 	return oval_collection_iterator_remaining((struct oval_iterator*)iter);
+ }
+ 
+-struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint)
++struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t opera, const char *hint)
+ {
+ 	struct oval_variable_possible_restriction *pr;
+ 	pr = malloc(sizeof(oval_variable_possible_restriction_t));
+-	pr->operator = operator;
++	pr->operator = opera;
+ 	pr->hint = oscap_strdup(hint);
+ 	pr->restrictions = oval_collection_new();
+ 	return pr;
+diff -Nur openscap-1.3.2_old/src/OVAL/public/oval_definitions.h openscap-1.3.2/src/OVAL/public/oval_definitions.h
+--- openscap-1.3.2_old/src/OVAL/public/oval_definitions.h	2020-03-11 04:30:50.546661222 -0400
++++ openscap-1.3.2/src/OVAL/public/oval_definitions.h	2020-03-11 04:31:30.354943942 -0400
+@@ -1669,7 +1669,7 @@
+  * @param hint A short description of what the value means or represents.
+  * @memberof oval_variable_possible_restriction
+  */
+-OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint);
++OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t opera, const char *hint);
+ 
+ 
+ /**

openscap.spec

@@ -1,14 +1,14 @@
 Name:                      openscap
-Version:                   1.3.6
+Version:                   1.3.2
-Release:                   1
+Release:                   5
 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
+Patch9000:                 Fix-scap_workbench-builderror.patch
 BuildRequires:             cmake >= 2.6 gcc gcc-c++ swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser
 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
@@ -86,17 +86,6 @@ cd build
 
 pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
 
-cd  $RPM_BUILD_ROOT/usr
-file `find -type f`| grep -w ELF | awk -F":" '{print $1}' | for i in `xargs`
-do
-  chrpath -d $i
-done
-cd -
-
-mkdir -p  $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_bindir}/%{name}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
-echo "%{_libdir}/%{name}" >> $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -116,9 +105,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/openscap/cpe/*
 
 %{_sysconfdir}/bash_completion.d
-%{_libexecdir}/oscap-remediate
-%{_unitdir}/oscap-remediate.service
-%config(noreplace) /etc/ld.so.conf.d/*
 
 %files devel
 %{_libdir}/libopenscap.so
@@ -142,18 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
-* Tue May 17 2022 wulei <wulei80@h-partners.com> - 1.3.6-1
-- Update package
-
-* Fri Jan 14 2022 wulei <wulei80@huawei.com> - 1.3.5-1
-- Package update
-
-* Mon Sep 13 2021 chenchen <chen_aka_jan@163.com> - 1.3.3-2
-- del rpath for some binaries and bin
-
-* Mon Jul 27 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.3.3-1
-- update package
-
 * Wed Mar 11 2020 Senlin Xia <xiasenlin1@huawei.com> 1.3.2-5
 - Fix scap-workbench compilation failure: declaration of 'operator' as parameter in oval_definitions.h