Merge branch 'master' into lxc

[bootcd.git] / bootcd.spec

diff --git a/bootcd.spec b/bootcd.spec
index 1bf3180..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
 
@@ -104,8 +106,8 @@ mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
 mkdir -p $RPM_BUILD_ROOT/etc/systemd/system
 cp -pr systemd/* $RPM_BUILD_ROOT/lib/systemd/system
 ln -sf /lib/systemd/system/pl_boot.target $RPM_BUILD_ROOT/etc/systemd/system/default.target
-mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/pl_boot.target.wants
-mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/pl_sysinit.target.wants
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.target.wants
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/pl_sysinit.target.wants
 ln -sf /lib/systemd/system/pl_boot.service $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.target.wants/pl_boot.service
 ln -sf /lib/systemd/system/pl_sysinit.service $RPM_BUILD_ROOT/lib/systemd/system/pl_sysinit.target.wants/pl_sysinit.service
 popd