diff --git a/.cvsignore b/.cvsignore index ebbe9f4..2130a9d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -openscap-0.5.6.tar.gz +openscap-0.5.7.tar.gz diff --git a/openscap-0.5.6-uninit.patch b/openscap-0.5.6-uninit.patch deleted file mode 100644 index 6d50e77..0000000 --- a/openscap-0.5.6-uninit.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up openscap-0.5.6/src/OVAL/oval_agent.c.uninit openscap-0.5.6/src/OVAL/oval_agent.c ---- openscap-0.5.6/src/OVAL/oval_agent.c.uninit 2010-01-05 11:45:00.028530255 +0100 -+++ openscap-0.5.6/src/OVAL/oval_agent.c 2010-01-05 11:45:14.768529206 +0100 -@@ -744,6 +744,7 @@ struct oval_results_model *oval_results_ - - model->systems = oval_collection_new(); - model->definition_model = definition_model; -+ model->is_locked = false; - if (syschar_models) { - struct oval_syschar_model *syschar_model; - for (syschar_model = *syschar_models; syschar_model; syschar_model = *(++syschar_models)) { -@@ -751,7 +752,6 @@ struct oval_results_model *oval_results_ - oval_results_model_add_system(model, sys); - } - } -- model->is_locked = false; - return model; - } - diff --git a/openscap.spec b/openscap.spec index 76cd733..0350e27 100644 --- a/openscap.spec +++ b/openscap.spec @@ -2,18 +2,17 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: openscap -Version: 0.5.6 -Release: 2%{?dist} +Version: 0.5.7 +Release: 1%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries License: LGPLv2+ URL: http://www.open-scap.org/ -Source0: http://fedorahosted.org/releases/o/p/openscap/%{name}-%{version}.tar.gz -Patch1: openscap-0.5.6-uninit.patch +Source0: http://fedorahosted.org/releases/o/p/openscap/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: swig pcre-devel libxml2-devel BuildRequires: rpm-devel -BuildRequires: libnl-devel +BuildRequires: libnl-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -52,12 +51,20 @@ BuildRequires: perl-devel The %{name}-perl package contains the bindings so that %{name} libraries can be used by perl. +%package utils +Summary: Openscap utilities +Group: Applications/System +Requires: %{name} = %{version}-%{release} +BuildRequires: libcurl-devel + +%description utils +The %{name}-utils package contains various utilities based on %{name} library. + %prep %setup -q -%patch1 -p1 -b .uninit %build -%configure +%configure --disable-debug make %{?_smp_mflags} %install @@ -93,20 +100,18 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/* %{_libdir}/*.so +%files utils +%defattr(-,root,root,-) +%{_bindir}/* %changelog -* Tue Jan 05 2010 Peter Vrabec 0.5.6-2 -- fixing uninitialized variable +* Fri Feb 26 2010 Peter Vrabec 0.5.7-1 +- upgrade +- new utils package * Mon Jan 04 2010 Peter Vrabec 0.5.6-1 - upgrade -* Sat Jan 2 2010 Tomas Mraz 0.5.5-2 -- rebuilt with new librpm - -* Thu Nov 12 2009 Peter Vrabec 0.5.5-1 -- upgrade - * Tue Sep 29 2009 Peter Vrabec 0.5.3-1 - upgrade diff --git a/sources b/sources index 38a5992..5342793 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f3c922a0ae4e7ca6b21ddc6d706f8146 openscap-0.5.6.tar.gz +0c72fb5549f71ea095e0fe537f8030e8 openscap-0.5.7.tar.gz