[openscap: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/openscap

[Peter Vrabec]

commit 30bdbf608f6e08699daa1de5d904a75f9671d320
Merge: 837a392 2c4d9c6
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Fri Jun 24 13:13:16 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/openscap
    
    Conflicts:
    	openscap.spec

 openscap.spec |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
---
diff --cc openscap.spec
index c5a5ffd,accd0ed..9fe14b9
--- a/openscap.spec
+++ b/openscap.spec
@@@ -2,8 -2,8 +2,13 @@@
  %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
  
  Name:           openscap
++<<<<<<< HEAD
 +Version:        0.7.3
 +Release:        1%{?dist}
++=======
+ Version:        0.7.2
+ Release:        3%{?dist}
++>>>>>>> 2c4d9c6cb96298d20573409541a252b7e5ea6a4d
  Summary:        Set of open source libraries enabling integration of the SCAP line of standards
  Group:          System Environment/Libraries
  License:        LGPLv2+
@@@ -204,12 -205,17 +209,21 @@@ f
  %files extra-probes
  %{_libexecdir}/openscap/probe_ldap57
  %{_libexecdir}/openscap/probe_dnscache
 +%{_libexecdir}/openscap/probe_partition
  
  %changelog
 +* Fri Jun 24 2011 Peter Vrabec <pvrabec at redhat.com> 0.7.3-1
 +- upgrade
 +
+ * Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.7.2-3
+ - Perl mass rebuild
+ 
+ * Fri Jun 10 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.7.2-2
+ - Perl 5.14 mass rebuild
+ 
+ * Wed Apr 20 2011 Peter Vrabec <pvrabec at redhat.com> 0.7.2-1
+ - upgrade
+ 
  * Fri Mar 11 2011 Peter Vrabec <pvrabec at redhat.com> 0.7.1-1
  - upgrade