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

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:26:08 2006
New Revision: 7877

URL: http://svn.erp5.org?rev=7877&view=rev
Log:
Commit mklivecd-0.5.9-0.15mdk spec files and patches

Modified:
    spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch
    spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-xres.patch
    spec/mandriva/2006.0/mklivecd/mklivecd.spec

Modified: spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch?rev=7877&r1=7876&r2=7877&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-keep-menu.patch Mon Jun 19 17:26:08 2006
@@ -5,7 +5,7 @@
  					tmp*)
  						;;
 -					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/menu*|lib/rpm*|lib/nxserver/nxhome*|lib/urpmi*|lib/samba*|lib/gnome*|lib/mysql*|lib/bacula*)
  						[ ! -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-0.5.9-xres.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-xres.patch?rev=7877&r1=7876&r2=7877&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-xres.patch (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd-0.5.9-xres.patch Mon Jun 19 17:26:08 2006
@@ -1,5 +1,5 @@
---- /usr/src/RPM/SOURCES/mklivecd/src/hwdetect.in	2005-03-03 17:34:27.000000000 +0100
-+++ hwdetect.in	2006-02-10 12:14:33.000000000 +0100
+--- mklivecd/src/hwdetect.in.xres	2005-03-03 17:34:27.000000000 +0100
++++ mklivecd/src/hwdetect.in	2006-02-10 12:14:33.000000000 +0100
 @@ -738,12 +738,12 @@
  		eval { $resolution = $rawX->get_resolution };
  	}

Modified: spec/mandriva/2006.0/mklivecd/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd.spec?rev=7877&r1=7876&r2=7877&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd.spec Mon Jun 19 17:26:08 2006
@@ -2,7 +2,7 @@
 
 %define name	mklivecd
 %define version	0.5.9
-%define release	%mkrel 0.14
+%define release	%mkrel 0.15
 
 %define Summary	Builds a LiveCD from an existing Mandriva Linux installation
 
@@ -43,16 +43,15 @@
 %patch7 -p0 -b .quiet
 %patch8 -p0 -b .fix_xorg
 %patch9 -p1 -b .splash
-%patch10 -p0 -b .xres
+%patch10 -p1 -b .xres
 
 %build
-# use 800x600 as default resolution like DrakX (some machines dislike 1024x768)
-%make DEF_RESOLUTION=800x600 DEF_VGAMODE=788
+
+%make
 
 %install
 rm -rf %{buildroot}
-# fix cdrom.ko lookup when building with kernel < 2.6.10-1mdk
-perl -pi -e 's! drivers/cdrom/cdrom ! !' dist/mklivecd
+
 %makeinstall_std
 
 %clean
@@ -66,6 +65,11 @@
 %{_datadir}/mklivecd/
 
 %changelog
+* Tue Feb 14 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.15mdk
+- Removed line overriding default resolution of 1024 x 764 (was still using 800x600)
+- Removed a bugfix concerning cdrom and kernel <= 2.6.10 (we are using 2.6.12)
+- Fixed a bug with bacula-dir (db was deleted by mklivecd)
+
 * Mon Feb 10 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.14mdk
 - Using a default resolution of 1024 x 764 if possible
 - save up the /etc/fstab if it exists