Merge branch 'master' of ssh://pkgs.fedoraproject.org/openscap
Conflicts: openscap.spec
This commit is contained in:
commit
30bdbf608f
@ -2,8 +2,13 @@
|
|||||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||||
|
|
||||||
Name: openscap
|
Name: openscap
|
||||||
|
<<<<<<< HEAD
|
||||||
Version: 0.7.3
|
Version: 0.7.3
|
||||||
Release: 1%{?dist}
|
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
|
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -210,6 +215,15 @@ fi
|
|||||||
* Fri Jun 24 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.3-1
|
* Fri Jun 24 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.3-1
|
||||||
- upgrade
|
- upgrade
|
||||||
|
|
||||||
|
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.7.2-3
|
||||||
|
- Perl mass rebuild
|
||||||
|
|
||||||
|
* Fri Jun 10 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.7.2-2
|
||||||
|
- Perl 5.14 mass rebuild
|
||||||
|
|
||||||
|
* Wed Apr 20 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.2-1
|
||||||
|
- upgrade
|
||||||
|
|
||||||
* Fri Mar 11 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.1-1
|
* Fri Mar 11 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.1-1
|
||||||
- upgrade
|
- upgrade
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user