2 changed files with 3 additions and 54 deletions
--- a/Fix-scap_workbench-builderror.patch
+++ b/Fix-scap_workbench-builderror.patch
@ -1,29 +0,0 @@
-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);
- 
- 
- /**
--- a/openscap.spec
+++ b/openscap.spec
@ -1,11 +1,11 @@
 Name:                      openscap
 Version:                   1.3.2
-Release:                   9
+Release:                   4
 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
@ -15,7 +15,7 @@ BuildRequires:             perl-XML-XPath bzip2
 %endif

 Requires:                  libcurl >= 7.12.0 rpmdevtools rpm-build
-Requires:                  %{name}-help = %{version}-%{release}
+
 Provides:                  %{name}-scanner = %{version}-%{release} %{name}-utils = %{version}-%{release}
 Provides:                  %{name}-engine-sce = %{version}-%{release} %{name}-containers = %{version}-%{release}

@ -84,13 +84,6 @@ cd build

 %delete_la

-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 -
-
 pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm

 %clean
@ -135,21 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*

 %changelog
-* Wed Nov 8 2023 liyanan <liyanan61@h-partners.com> - 1.3.2-9
- Remove rpath
-
-* Fri Nov 06 2020 caodongxia <caodongxia@huawei.com> - 1.3.2-8
- Add install requires help package into main package
-
-* Tue Aug 18 2020 liquor <lirui130@huawei.com> - 1.3.2-7
- rebuild for requirement package update
-
-* Mon May 18 2020 wangchen <wangchen137@huawei.com> 1.3.2-6
- rebuild for openscap
-
-* 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
-
 * Sat Feb 29 2020 lihao <lihao129@huawei.com> - 1.3.2-4
 - Fix incompatible with rpm-devel-4.15