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

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:26:50 2006
New Revision: 7883

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

Added:
    spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-trayopen.patch
Modified:
    spec/mandriva/2006.0/mklivecd/mklivecd.spec

Added: spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-trayopen.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-trayopen.patch?rev=7883&view=auto
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-trayopen.patch (added)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.6.0-no-trayopen.patch Mon Jun 19 17:26:50 2006
@@ -1,0 +1,23 @@
+--- mklivecd/src/halt.local.in	2006-04-02 00:57:04.000000000 +0200
++++ mklivecd-patched/src/halt.local.in	2006-05-23 17:33:27.000000000 +0200
+@@ -13,14 +13,14 @@
+ # try to put halt/reboot in cache, if not called directly from them
+ system("$_ --help 2>/dev/null") foreach qw(halt reboot);
+ 
+-my $f = detect_devices::tryOpen($device);
++#my $f = detect_devices::tryOpen($device);
+ # see openCdromTray() and unlockCdrom(), from install_any
+-ioctl($f, c::CDROM_LOCKDOOR(), 0);
+-ioctl($f, c::CDROMEJECT(), 0);
++#ioctl($f, c::CDROM_LOCKDOOR(), 0);
++#ioctl($f, c::CDROMEJECT(), 0);
+ 
+-print "\n\nPlease press <Enter> once the medium is removed.\n";
+-<STDIN>;
++#print "\n\nPlease press <Enter> once the medium is removed.\n";
++#<STDIN>;
+ 
+-ioctl($f, 0x5319, 0); # CDROMCLOSETRAY
++#ioctl($f, 0x5319, 0); # CDROMCLOSETRAY
+ 
+ system("/initrd$ARGV[0] -i -d -p");

Modified: spec/mandriva/2006.0/mklivecd/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd.spec?rev=7883&r1=7882&r2=7883&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd.spec Mon Jun 19 17:26:50 2006
@@ -2,7 +2,7 @@
 
 %define name	mklivecd
 %define version	0.6.0
-%define release	%mkrel 1
+%define release	%mkrel 2
 
 %define Summary	Builds a LiveCD from an existing Mandriva Linux installation
 
@@ -14,12 +14,10 @@
 Group:		System/Configuration/Boot and Init
 URL:		http://livecd.berlios.de/
 Source0:	%{name}-%{version}.tar.bz2
-Patch3:     	mklivecd-0.6.0-no-hotplug.patch.bz2
-Patch4:     	mklivecd-0.6.0-halt-proc.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
+Patch1:         mklivecd-0.6.0-no-trayopen.patch.bz2
+Patch2:     	mklivecd-0.6.0-no-hotplug.patch.bz2
+Patch3:     	mklivecd-0.6.0-halt-proc.patch.bz2
+Patch4:		mklivecd-0.6.0-keep-lib.patch.bz2
 Requires:	busybox cloop-utils mkisofs drakxtools-newt
 Requires:	squashfs-tools mediacheck syslinux zisofs-tools
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -30,12 +28,10 @@
 
 %prep
 %setup -q -n %{name}
-%patch3 -p1 -b .hotplug
-# (tv) conflict with rc.sysinit:
-%patch4 -p1 -b .proc
-%patch5 -p1 -b .lib
-#%patch7 -p0 -b .quiet
-#%patch9 -p1 -b .splash
+%patch1 -p1 -b .notrayopen
+%patch2 -p1 -b .hotplug
+%patch3 -p1 -b .proc
+%patch4 -p1 -b .lib
 
 %build
 # use 1024x768 as default resolution like DrakX (some machines dislike 1024x768)
@@ -59,6 +55,9 @@
 %{_datadir}/mklivecd/
 
 %changelog
+* Thu May 23 2006 christophe Dumez <christophe at nexedi.com> 0.6.0-2mdk
+- added patch so that cdrom tray does not open on halt
+
 * Thu May 4 2006 christophe Dumez <christophe at nexedi.com> 0.6.0-1mdk
 - removed no longer needed /proc umount patch
 - respect release number convention