[Erp5-report] r7880 - /spec/mandriva/2006.0/mklivecd/

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:26:29 2006
New Revision: 7880

URL: http://svn.erp5.org?rev=7880&view=rev
Log:
Commit mklivecd-0.6.0-0.1mdk spec files and patches

Added:
    spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-keep-lib.patch
Modified:
    spec/mandriva/2006.0/mklivecd/mklivecd.spec

Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-keep-lib.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-keep-lib.patch?rev=7880&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-keep-lib.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-keep-lib.patch Mon Jun 19 17:26:29 2006
@@ -1,0 +1,11 @@
+--- mklivecd/src/rc.sysinit.in	2006-03-19 16:14:52.000000000 +0100
++++ mklivecd-patched/src/rc.sysinit.in	2006-05-02 12:57:00.000000000 +0200
+@@ -347,7 +347,7 @@
+ 			case $d in
+ 				tmp*)
+ 					;;
+-				lib/menu*|lib/rpm*|lib/nxserver/nxhome*|lib/urpmi*|lib/samba*|lib/gnome*|lib/mysql*)
++				lib/menu*|lib/rpm*|lib/nxserver/nxhome*|lib/urpmi*|lib/samba*|lib/gnome*|lib/mysql*|lib/bacula*|lib/tftpboot*|lib/dhcp*)
+ 					[ ! -e "/var/$d" ] && ln -sf "$MNTLIVECD/var/$d" "/var/$d" || true
+ 					;;
+ 				cache*|db*|lib*|local*|lock*|log*|mail*|mtink*|nis*|opt*|preserve*|run*|spool*|xkb*|yp*)

Modified: spec/mandriva/2006.0/mklivecd/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd.spec?rev=7880&r1=7879&r2=7880&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd.spec Mon Jun 19 17:26:29 2006
@@ -1,8 +1,8 @@
 # $Id: mklivecd.spec.in,v 1.12 2003/10/04 10:03:28 jaco Exp $
 
 %define name	mklivecd
-%define version	0.5.9
-%define release	%mkrel 0.17
+%define version	0.6.0
+%define release	%mkrel 0.1
 
 %define Summary	Builds a LiveCD from an existing Mandriva Linux installation
 
@@ -14,11 +14,12 @@
 Group:		System/Configuration/Boot and Init
 URL:		http://livecd.berlios.de/
 Source0:	%{name}-%{version}.tar.bz2
-Patch3:     	mklivecd-0.5.9-no-more-hotplug.patch.bz2
-Patch4:     	mklivecd-0.5.9-quiet-umount.patch.bz2
-Patch5:     	mklivecd-0.5.9-keep-menu.patch.bz2
-Patch7:     	mklivecd-0.5.9-quiet-mode.patch.bz2
-Patch9:     	mklivecd-0.5.9-splash.patch.bz2
+#Patch3:     	mklivecd-0.6.0-no-more-hotplug.patch.bz2
+#Patch4:     	mklivecd-0.6.0-quiet-umount.patch.bz2
+Patch5:		mklivecd-0.6.0-keep-lib.patch.bz2
+#Patch5:     	mklivecd-0.6.0-keep-menu.patch.bz2
+#Patch7:     	mklivecd-0.6.0-quiet-mode.patch.bz2
+#Patch9:     	mklivecd-0.6.0-splash.patch.bz2
 Requires:	busybox cloop-utils mkisofs drakxtools-newt
 Requires:	squashfs-tools mediacheck syslinux zisofs-tools
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -29,12 +30,12 @@
 
 %prep
 %setup -q -n %{name}
-%patch3 -p0 -b .hotplug
+#%patch3 -p0 -b .hotplug
 # (tv) conflict with rc.sysinit:
-%patch4 -p1 -b .umount
-%patch5 -p0 -b .menu
-%patch7 -p0 -b .quiet
-%patch9 -p1 -b .splash
+#%patch4 -p1 -b .umount
+%patch5 -p1 -b .lib
+#%patch7 -p0 -b .quiet
+#%patch9 -p1 -b .splash
 
 %build
 # use 1024x768 as default resolution like DrakX (some machines dislike 1024x768)
@@ -58,6 +59,10 @@
 %{_datadir}/mklivecd/
 
 %changelog
+* Thu May 1 2006 christophe Dumez <christophe at nexedi.com> 0.6.0-0.1mdk
+- new upstream release
+- removed no longer needed patchs
+
 * Thu Feb 23 2006 christophe Dumez <christophe at nexedi.com> 0.5.9-0.17mdk
 - new snapshot (20060109)
 - remove patches 1, 2 & 10 now that draklive supercedes mklivecd