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

[Dennis Gilmore]

commit 037c3a7428c6c9fc99082346d262f131116dc0cb
Merge: b6a2b9a dc42625
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Sun Jan 20 10:22:33 2013 -0600

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

 koji-1.7.1-checkUpload.patch        |   30 +++++++++++++++++++++++
 koji-1.7.1-fix-external-repos.patch |   44 +++++++++++++++++++++++++++++++++++
 koji.spec                           |   10 +++++++-
 3 files changed, 83 insertions(+), 1 deletions(-)
---
diff --cc koji.spec
index 413f084,11b95e2..9231735
--- a/koji.spec
+++ b/koji.spec
@@@ -9,9 -9,10 +9,11 @@@ 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
 +Source1: README.epel
+ Patch1: koji-1.7.1-fix-external-repos.patch
+ Patch2: koji-1.7.1-checkUpload.patch
  
 -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
@@@ -125,8 -123,9 +127,10 @@@ koji-web is a web UI to the Koji system
  
  %prep
  %setup -q
 +cp %{SOURCE1} README.epel
  %patch0 -p1 -b .orig
+ %patch1 -p1 -b .repos
+ %patch2 -p1 -b .int
  
  %build