From 72f31ad752006ed6f7a755b5f4a2fd344a422325b77193b3858c7cd527686378 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 26 Mar 2012 09:33:19 +0000 Subject: [PATCH] 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