diff --git a/Fix-scap_workbench-builderror.patch b/Fix-scap_workbench-builderror.patch new file mode 100644 index 0000000..ef54d1b --- /dev/null +++ b/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); + + + /** diff --git a/openscap.spec b/openscap.spec index 31ba314..a7053ea 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,11 +1,11 @@ Name: openscap Version: 1.3.2 -Release: 4 +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 @@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/* %changelog +* Wed Mar 11 2020 Senlin Xia 1.3.2-5 +- Fix scap-workbench compilation failure: declaration of 'operator' as parameter in oval_definitions.h + * Sat Feb 29 2020 lihao - 1.3.2-4 - Fix incompatible with rpm-devel-4.15