actually build with /pld/ in dir path; do not remove buildfiles

diff --git a/linux-live.spec b/linux-live.spec
index 349aed8c88a9bb3eac5f3a46b754eb3e47c067a2..736b9cfadbf45d949a3859f4dd6bb297d0264850 100644 (file)
--- a/linux-live.spec
+++ b/linux-live.spec
@@ -10,8 +10,9 @@ Source0:      https://github.com/Tomas-M/linux-live/archive/v%{version}.tar.gz?/%{nam
 Source1:       http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-4.06.tar.gz
 # Source1-md5: ab705f8a0be0598770014bd5498b2eb2
 Source2:       %{name}-build.sh
-Patch0:                https://github.com/Tomas-M/linux-live/pull/5.patch
-# Patch0-md5:  603c98f4c516929044bccf0419423586
+Patch0:                pld.patch
+Patch1:                https://github.com/Tomas-M/linux-live/pull/5.patch
+# Patch1-md5:  603c98f4c516929044bccf0419423586
 URL:           http://www.linux-live.org/
 BuildRequires: nasm
 BuildRequires: perl-base
@@ -66,6 +67,7 @@ manuala i wszystkie inne nieistotne dla nas pliki), a następnie
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 cd initramfs/static
 ./update
@@ -80,7 +82,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 # rebuild isolinux to be in /pld/ subdir
 cd tools
 CC="%{__cc}" \
-sh -x ./isolinux.bin.update
+sed -e '/rm/d' ./isolinux.bin.update | sh -x
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -88,6 +90,8 @@ install -d $RPM_BUILD_ROOT{%{_libexecdir},%{_bindir},%{_sbindir}}
 cp -a bootfiles bootinfo.txt build initramfs livekitlib tools $RPM_BUILD_ROOT%{_libexecdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/linux-live-build
 
+rm -r $RPM_BUILD_ROOT%{_libexecdir}/tools/syslinux-*
+
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p .config $RPM_BUILD_ROOT%{_sysconfdir}/config
 

diff --git a/pld.patch b/pld.patch
new file mode 100644 (file)
index 0000000..1c06e3b
--- /dev/null
+++ b/pld.patch
@@ -0,0 +1,11 @@
+--- linux-live-1.8/.config~    2013-01-04 16:17:07.000000000 +0200
++++ linux-live-1.8/.config     2013-03-25 09:20:51.899864473 +0200
+@@ -7,7 +7,7 @@
+ # Must not contain any spaces.
+ # If you change it, you must run ./tools/isolinux.bin.update script
+ # in order to update isolinux.bin for CD booting.
+-LIVEKITNAME="mylinux"
++LIVEKITNAME="pld"
+ 
+ # Kernel file, will be copied to your Live Kit
+ VMLINUZ=/boot/vmlinuz