X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootcd.spec;h=282680728275103e3afd4e68da9a0405ef4b869e;hb=d0a37bd3ca6cb2a6f736a1e7970ff97f286da49a;hp=9652e88047a0b24abdb17eee9988fe5f93fc3d46;hpb=789ada2b68c8c314c5f420b688df1d95e8c90375;p=bootcd.git

diff --git a/bootcd.spec b/bootcd.spec
index 9652e88..2826807 100644
--- a/bootcd.spec
+++ b/bootcd.spec
@@ -2,8 +2,8 @@
 %define nodefamily %{pldistro}-%{distroname}-%{_arch}
 
 %define name bootcd-%{nodefamily}
-%define version 5.0
-%define taglevel 11
+%define version 5.1
+%define taglevel 3
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -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
 
@@ -99,13 +101,6 @@ for script in bootcd bootcd-kernel; do
     install -D -m 755 plc.d/$script $RPM_BUILD_ROOT/etc/plc.d/$script
 done
 
-#systemd files
-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 $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.target $RPM_BUILD_ROOT/etc/systemd/system/default.target
-#ln -sf $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.service $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.target.wants/pl_boot.service
-#ln -sf $RPM_BUILD_ROOT/lib/systemd/system/pl_sysinit.service $RPM_BUILD_ROOT/lib/systemd/system/pl_sysinit.target.wants/pl_sysinit.service
 popd
     
 %clean
@@ -118,10 +113,19 @@ rm -rf $RPM_BUILD_ROOT
 %files -n bootcd-initscripts
 %defattr(-,root,root,-)
 /etc/plc.d
-/lib/systemd/system
-/etc/systemd/system
 
 %changelog
+* Thu Feb 21 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.1-3
+- reviewed for systemd & f18
+
+* Mon May 07 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.1-2
+- turn off selinux, turns out needed with some combinations like lxc/f14
+
+* Wed Apr 11 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.1-1
+- compatible with pre- and post- f16
+- add systemd friendlyness to bootcd
+- also add biosdevname=0 tp kernel args so ethernet devices are still named in eth<x>
+
 * Mon Nov 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.0-11
 - add requires: to syslinux-perl on fedora14