summaryrefslogtreecommitdiffstats
path: root/cobbler.spec
diff options
context:
space:
mode:
authorJames Laska <jlaska@redhat.com>2008-12-16 16:04:09 -0500
committerJames Laska <jlaska@redhat.com>2008-12-16 16:04:09 -0500
commit09a9dbc4abefa64bcd0093925230d72a6fa69788 (patch)
treec9e3c6013815f054af0978d137d4101f74533a6b /cobbler.spec
parent2da819c3a394bdf92d6c8a524800c4147889a098 (diff)
parentd43faca500010f2591ac5922d422e8ea1b46b418 (diff)
downloadcobbler-09a9dbc4abefa64bcd0093925230d72a6fa69788.tar.gz
cobbler-09a9dbc4abefa64bcd0093925230d72a6fa69788.tar.xz
cobbler-09a9dbc4abefa64bcd0093925230d72a6fa69788.zip
Merge commit 'origin/devel' into devel
Conflicts: cobbler/pxegen.py
Diffstat (limited to 'cobbler.spec')
-rw-r--r--cobbler.spec4
1 files changed, 4 insertions, 0 deletions
diff --git a/cobbler.spec b/cobbler.spec
index bea1a1e6..8cdf7918 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -21,7 +21,11 @@ Requires: python-devel
Requires: createrepo
Requires: python-cheetah
Requires: rsync
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
Requires: genisoimage
+%else
+Requires: mkisofs
+%endif
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service