[koji/el6: 4/4] Merge branch 'master' into el6

[Dennis Gilmore]

commit aa1fe264a4237b97735de3f332da887a2cfa8dc3
Merge: 24e50e2 bd91f98
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Jun 1 11:05:44 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	koji.spec

 .gitignore          |    1 +
 fedora-config.patch |   12 ++++++------
 koji.spec           |   16 +++++++++++-----
 sources             |    2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)
---
diff --cc koji.spec
index 83064bc,b6d41e9..0372d0c
--- a/koji.spec
+++ b/koji.spec
@@@ -9,9 -9,8 +9,10 @@@ Summary: Build system tool
  Group: Applications/System
  URL: http://fedorahosted.org/koji
  Patch0: fedora-config.patch
++Source0: https://fedorahosted.org/released/koji/koji-%{version}.tar.bz2
 +Source0: https://fedorahosted.org/releases/k/o/koji/%{name}-%{version}.tar.bz2
 +Source1: README.epel
  
 -Source: https://fedorahosted.org/released/koji/koji-%{version}.tar.bz2
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch: noarch
  Requires: python-krbV >= 1.0.13
@@@ -230,9 -225,15 +232,13 @@@ if [ $1 = 0 ]; the
  fi
  
  %changelog
+ * Fri Jun 01 2012 Dennis Gilmore <dennis at ausil.us> - 1.7.0-1
+ - update to 1.7.0 many bugfixes and improvements
+ - now uses mod_wsgi 
+ 
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 +* Mon Jan 03 2011 Dennis Gilmore <dennis at ausil.us> - 1.6.0-1.1
 +- drop Requires on qemu-img on epel for koji-vm
 +- add readme note on epel
  
  * Fri Dec 17 2010 Dennis Gilmore <dennis at ausil.us> - 1.6.0-1
  - update to 1.6.0