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

[Dennis Gilmore]

commit 36a898cbe7d8530b6b8ed9dee15ab3d44e3b7693
Merge: 037c3a7 613da53
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Apr 1 20:45:04 2013 -0500

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

 .gitignore                          |    1 +
 koji-1.7.1-checkUpload.patch        |   30 -----------------------
 koji-1.7.1-fix-external-repos.patch |   44 -----------------------------------
 koji.spec                           |   14 ++++++----
 sources                             |    2 +-
 5 files changed, 10 insertions(+), 81 deletions(-)
---
diff --cc koji.spec
index 9231735,09dd72c..9199698
--- a/koji.spec
+++ b/koji.spec
@@@ -9,11 -9,8 +9,9 @@@ 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
@@@ -127,10 -121,7 +125,8 @@@ 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