Merge branch 'master' into lxc

in bootcd.spec, reinstate the test on the fedora distrib (for
requiring perl-syslinux) in a f16-compatible way

diff --git a/bootcd.spec b/bootcd.spec
index f1165d7..e5298ba 100644 (file)
--- a/bootcd.spec
+++ b/bootcd.spec
@@ -34,7 +34,9 @@ Requires: dosfstools, mkisofs, gzip, mtools, syslinux
 Requires: yum-utils
 # mkdiskimage is used for USB-partitioned mode
 # but it now comes in a separate rpm
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 14
 Requires: syslinux-perl
+%endif
 
 Requires: pyplnet