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

[Dennis Gilmore]

commit b6a2b9ae8e037d10004585124b42b1f39d4cc415
Merge: 8aa7f6d 02a1c68
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Nov 20 20:13:38 2012 -0600

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

 .gitignore                                         |    1 +
 ...command-avoid-passing-recently-added-even.patch |   63 --------------------
 koji.spec                                          |   11 ++--
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 70 deletions(-)
---
diff --cc koji.spec
index 3c6aa36,2f667ff..413f084
--- 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: 0003-in-taginfo-command-avoid-passing-recently-added-even.patch
- Patch2: 0001-mount-all-of-dev.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
- %patch2 -p1
  
  %build
  
@@@ -235,14 -225,11 +231,17 @@@ if [ $1 = 0 ]; the
  fi
  
  %changelog
+ * Wed Nov 21 2012 Dennis Gilmore <dennis at ausil.us> - 1.7.1-1
+ - update to upstream 1.7.1 release
+ 
  * Sat Sep 01 2012 Dennis Gilmore <dennis at ausil.us> - 1.7.0-7
 -- add patch to mount all of /dev on appliances and lives
 +- add the patch that we had previously had hotapplied in fedora infra
 +
 +* Sat Sep 01 2012 Dennis Gilmore <dennis at ausil.us> - 1.7.0-6
 +- remove even trying to make devices i the chroots
 +
 +* Sat Sep 01 2012 Dennis Gilmore <dennis at ausil.us> - 1.7.0-5
 +- add patch to check for /dev/loopX before making them
  
  * Fri Aug 31 2012 Dennis Gilmore <dennis at ausil.us> - 1.7.0-4
  - add patch to only make /dev/urandom if it doesnt exist