From 72f31ad752006ed6f7a755b5f4a2fd344a422325b77193b3858c7cd527686378 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 26 Mar 2012 09:33:19 +0000 Subject: [PATCH 1/2] Accepting request 110881 from home:mcalmer:branches:security - require libnl-devel on older SUSE version OBS-URL: https://build.opensuse.org/request/show/110881 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=36 --- openscap.changes | 5 +++++ openscap.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/openscap.changes b/openscap.changes index a763c88..f32010e 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 24 10:54:22 UTC 2012 - mc@suse.com + +- require libnl-devel on older SUSE version + ------------------------------------------------------------------- Mon Mar 19 15:52:17 UTC 2012 - cfarrell@suse.com diff --git a/openscap.spec b/openscap.spec index d18602f..b6bd61e 100644 --- a/openscap.spec +++ b/openscap.spec @@ -30,11 +30,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel BuildRequires: libcurl-devel BuildRequires: libgcrypt-devel +%if 0%{?suse_version} && 0%{?suse_version} <=1140 +BuildRequires: libnl-devel +%else BuildRequires: libnl-1_1-devel +%endif BuildRequires: libxml2-devel # Use package name cause of "have choice for perl(XML::Parser): brp-check-suse perl-XML-Parser" BuildRequires: gconf2-devel BuildRequires: libblkid-devel +BuildRequires: libcap-devel BuildRequires: libselinux-devel BuildRequires: libxslt-devel BuildRequires: openldap2-devel @@ -43,9 +48,8 @@ BuildRequires: perl-XML-Parser BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: rpm-devel -BuildRequires: libcap-devel -BuildRequires: unixODBC-devel BuildRequires: swig +BuildRequires: unixODBC-devel Summary: A Set of Libraries for Integration with SCAP License: LGPL-2.1+ Group: Development/Tools/Other From 50ce8ceb61976ca367dd263e2427d057c31ac12fea375b95db1046a908cdbfcc Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 30 Mar 2012 14:22:49 +0000 Subject: [PATCH 2/2] - Updated to 0.8.2 - XCCDF check-import support - XSLT transformation for XCCDF 1.1 to 1.2 migration - SCE reports now optionally use the new check-import functionality and don't need separate SCE result files - bug fixes OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=37 --- openscap-0.8.1.tar.gz | 3 --- openscap-0.8.2.tar.gz | 3 +++ openscap.changes | 10 ++++++++++ openscap.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 openscap-0.8.1.tar.gz create mode 100644 openscap-0.8.2.tar.gz diff --git a/openscap-0.8.1.tar.gz b/openscap-0.8.1.tar.gz deleted file mode 100644 index 0db8a36..0000000 --- a/openscap-0.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3365a5f4e7535e5f7134fdf386d4bd35d9b98f61d185be67606e946dc62efedc -size 4574151 diff --git a/openscap-0.8.2.tar.gz b/openscap-0.8.2.tar.gz new file mode 100644 index 0000000..ae6abcf --- /dev/null +++ b/openscap-0.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe7d6b3f20c08feef5c70ff3a02b752b593a8d8a3b3d1302d8e31fe0c29cce11 +size 4524453 diff --git a/openscap.changes b/openscap.changes index f32010e..750c90b 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Mar 30 16:21:21 CEST 2012 - meissner@suse.de + +- Updated to 0.8.2 + - XCCDF check-import support + - XSLT transformation for XCCDF 1.1 to 1.2 migration + - SCE reports now optionally use the new check-import functionality + and don't need separate SCE result files + - bug fixes + ------------------------------------------------------------------- Sat Mar 24 10:54:22 UTC 2012 - mc@suse.com diff --git a/openscap.spec b/openscap.spec index b6bd61e..6450b56 100644 --- a/openscap.spec +++ b/openscap.spec @@ -20,7 +20,7 @@ %define with_bindings 0 Name: openscap -Version: 0.8.1 +Version: 0.8.2 Release: 1.0 Source: http://www.open-scap.org/download/%name-%version.tar.gz Source1: oscap-scan.init