Merge commit 'f90f6b856d' into mead

Conflicts:
	cli/koji
	docs/schema.sql
	hub/kojihub.py
	koji.spec
	www/kojiweb/index.py
	www/kojiweb/taskinfo.chtml
This commit is contained in:
Mike McLean 2010-04-08 17:12:49 -04:00
commit c742272ac6
22 changed files with 1913 additions and 899 deletions

View file

@ -69,8 +69,10 @@ Requires: /usr/bin/cvs
Requires: /usr/bin/svn
Requires: /usr/bin/git
Requires: python-cheetah
%if 0%{?rhel} >= 5
%if 0%{?rhel} == 5
Requires: createrepo >= 0.4.11-2
Requires: python-hashlib
Requires: python-createrepo
%endif
%if 0%{?fedora} >= 9
Requires: createrepo >= 0.9.2