diff --git a/.gitignore b/.gitignore index fdcc3a7..32cf290 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ openscap-0.6.0.tar.gz /openscap-0.8.1.tar.gz /openscap-0.8.2.tar.gz /openscap-0.8.3.tar.gz +/openscap-0.8.4.tar.gz diff --git a/openscap-0.8.3-resolve.patch b/openscap-0.8.3-resolve.patch deleted file mode 100644 index 1e11b21..0000000 --- a/openscap-0.8.3-resolve.patch +++ /dev/null @@ -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) - diff --git a/openscap.spec b/openscap.spec index 56e4075..f3148d0 100644 --- a/openscap.spec +++ b/openscap.spec @@ -2,15 +2,13 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: openscap -Version: 0.8.3 -Release: 2%{?dist} +Version: 0.8.4 +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 -# 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 @@ -103,7 +101,6 @@ commonly used and require additional dependencies. %prep %setup -q -%patch0 -p 1 -b .resolve %build %ifarch sparc64 @@ -234,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/openscap/probe_gconf %changelog +* Tue Aug 07 2012 Petr Lautrbach 0.8.4-1 +- upgrade + * Tue Jul 31 2012 Petr Lautrbach 0.8.3-2 - fix Profile and @hidden issue diff --git a/sources b/sources index f55c61e..6f3890e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8dca628b3952a6e0141402d158f140b1 openscap-0.8.3.tar.gz +3f4d6946e366329791bc455e0083f3e6 openscap-0.8.4.tar.gz