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:
commit
c742272ac6
22 changed files with 1913 additions and 899 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue