[oz/el6: 8/8] Merge branch 'master' into el6

[Pádraig Brady]

commit b67bf9cf1883d5a82c890858c6ff29ec98268c7f
Merge: 5a8c851 a84f400
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon May 14 13:30:10 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	oz.spec
    	sources

 .gitignore |    2 ++
 oz.spec    |   43 +++++++++++++++++++++++++------------------
 sources    |    2 +-
 3 files changed, 28 insertions(+), 19 deletions(-)
---
diff --cc oz.spec
index f436c1b,16bf93b..155e81c
--- a/oz.spec
+++ b/oz.spec
@@@ -1,16 -1,14 +1,17 @@@
 +%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 +
  Summary: Library and utilities for automated guest OS installs
  Name: oz
- Version: 0.5.0
- Release: 2%{?dist}
+ Version: 0.8.0
+ Release: 1%{?dist}
  License: LGPLv2
  Group: Development/Libraries
  URL: http://aeolusproject.org/oz.html
- Source0: http://repos.fedorapeople.org/repos/aeolus/%{name}/%{version}/tarball/%{name}-%{version}.tar.gz
+ Source0: http://repos.fedorapeople.org/repos/aeolus/oz/%{version}/tarball/%{name}-%{version}.tar.gz
  BuildArch: noarch
  Requires: python >= 2.5
--Requires: gvnc-tools
++#Not currently available in epel. Used for screenshots
++#Requires: gvnc-tools
  Requires: python-libguestfs
  Requires: libxml2-python
  Requires: libvirt-python
@@@ -85,6 -86,21 +89,9 @@@ f
  
  
  %changelog
+ * Mon May 14 2012 Pádraig Brady <P at draigBrady.com> - 0.8.0-1
+ - Update to release 0.8.0
+ 
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Fri Sep 16 2011 Chris Lalancette <clalance at redhat.com> - 0.7.0-1
 -- Update to release 0.7.0
 -
 -* Fri Aug 12 2011 Chris Lalancette <clalance at redhat.com> - 0.5.0-4
 -- Make oz require openssh-clients to get the ssh binary
 -
 -* Wed Jul 27 2011 Chris Lalancette <clalance at redhat.com> - 0.5.0-3
 -- Minor cleanups to the spec file
 -
  * Tue Jul 05 2011 Pádraig Brady <P at draigBrady.com> - 0.5.0-2
  - Adjust package as per updated Fedora standards