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

[Dennis Gilmore]

commit b47aaa0633af709b5292591327d86ab3ec62f21a
Merge: 3a5d348 ebb5f90
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Jul 29 10:06:16 2014 -0500

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

 ...ove-workdir-from-tmp-koji-to-var-tmp-koji.patch |   28 +++++
 0002-image-support-xz-compressed-raw-files.patch   |  119 ++++++++++++++++++++
 compress-docker.patch                              |   24 ++++
 koji.spec                                          |   18 +++-
 4 files changed, 188 insertions(+), 1 deletions(-)
---
diff --cc koji.spec
index 741f569,4ab5fee..59507ba
--- a/koji.spec
+++ b/koji.spec
@@@ -9,9 -9,11 +9,12 @@@ 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: 0001-move-workdir-from-tmp-koji-to-var-tmp-koji.patch
+ Patch2: 0002-image-support-xz-compressed-raw-files.patch
+ Patch3: compress-docker.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 -127,10 +128,11 @@@ koji-web is a web UI to the Koji system
  
  %prep
  %setup -q
 +cp %{SOURCE1} README.epel
  %patch0 -p1 -b .orig
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
  
  %build