openscap-0.8.4

This commit is contained in:
Petr Lautrbach 2012-08-07 13:55:02 +02:00
parent 10e93e8b1a
commit bafc197cb1
4 changed files with 7 additions and 22 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ openscap-0.6.0.tar.gz
/openscap-0.8.1.tar.gz /openscap-0.8.1.tar.gz
/openscap-0.8.2.tar.gz /openscap-0.8.2.tar.gz
/openscap-0.8.3.tar.gz /openscap-0.8.3.tar.gz
/openscap-0.8.4.tar.gz

View File

@ -1,16 +0,0 @@
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

@ -2,15 +2,13 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: openscap Name: openscap
Version: 0.8.3 Version: 0.8.4
Release: 2%{?dist} Release: 1%{?dist}
Summary: Set of open source libraries enabling integration of the SCAP line of standards Summary: Set of open source libraries enabling integration of the SCAP line of standards
Group: System Environment/Libraries Group: System Environment/Libraries
License: LGPLv2+ License: LGPLv2+
URL: http://www.open-scap.org/ URL: http://www.open-scap.org/
Source0: http://fedorahosted.org/releases/o/p/openscap/%{name}-%{version}.tar.gz 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: swig libxml2-devel libxslt-devel perl-XML-Parser BuildRequires: swig libxml2-devel libxslt-devel perl-XML-Parser
BuildRequires: rpm-devel BuildRequires: rpm-devel
@ -103,7 +101,6 @@ commonly used and require additional dependencies.
%prep %prep
%setup -q %setup -q
%patch0 -p 1 -b .resolve
%build %build
%ifarch sparc64 %ifarch sparc64
@ -234,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libexecdir}/openscap/probe_gconf %{_libexecdir}/openscap/probe_gconf
%changelog %changelog
* Tue Aug 07 2012 Petr Lautrbach <plautrba@redhat.com> 0.8.4-1
- upgrade
* Tue Jul 31 2012 Petr Lautrbach <plautrba@redhat.com> 0.8.3-2 * Tue Jul 31 2012 Petr Lautrbach <plautrba@redhat.com> 0.8.3-2
- fix Profile and @hidden issue - fix Profile and @hidden issue

View File

@ -1 +1 @@
8dca628b3952a6e0141402d158f140b1 openscap-0.8.3.tar.gz 3f4d6946e366329791bc455e0083f3e6 openscap-0.8.4.tar.gz