fix Profile and @hidden issue

This commit is contained in:
Petr Lautrbach 2012-07-31 14:46:07 +02:00
parent 91a497a532
commit 05182a35c3
2 changed files with 19 additions and 0 deletions

View File

@ -0,0 +1,16 @@
diff -up openscap-0.8.3/src/XCCDF/resolve.c.resolve openscap-0.8.3/src/XCCDF/resolve.c
--- openscap-0.8.3/src/XCCDF/resolve.c.resolve 2012-07-25 09:44:55.000000000 +0200
+++ openscap-0.8.3/src/XCCDF/resolve.c 2012-07-31 14:25:33.374437192 +0200
@@ -102,8 +102,10 @@ static void xccdf_resolve_warning(void *
#define XCCDF_RESOLVE_FLAG(ITEM,PARENT,FLAGNAME) do { \
if (!ITEM->item.defined_flags.FLAGNAME) { \
- ITEM->item.flags.FLAGNAME = PARENT->item.flags.FLAGNAME; \
- ITEM->item.defined_flags.FLAGNAME = true; \
+ if (PARENT->item.defined_flags.FLAGNAME) { \
+ ITEM->item.flags.FLAGNAME = PARENT->item.flags.FLAGNAME; \
+ ITEM->item.defined_flags.FLAGNAME = true; \
+ } \
}\
} while (false)

View File

@ -9,6 +9,8 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.open-scap.org/
Source0: http://fedorahosted.org/releases/o/p/openscap/%{name}-%{version}.tar.gz
# temporary resolve Profile @hidden issue
Patch0: openscap-0.8.3-resolve.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: swig libxml2-devel libxslt-devel perl-XML-Parser
BuildRequires: rpm-devel
@ -101,6 +103,7 @@ commonly used and require additional dependencies.
%prep
%setup -q
%patch0 -p 1 -b .resolve
%build
%ifarch sparc64