[Erp5-report] r7879 - /spec/mandriva/2006.0/mklivecd/mklivecd.spec

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:26:24 2006
New Revision: 7879

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

Modified:
    spec/mandriva/2006.0/mklivecd/mklivecd.spec

Modified: spec/mandriva/2006.0/mklivecd/mklivecd.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/mklivecd/mklivecd.spec?rev=7879&r1=7878&r2=7879&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd.spec Mon Jun 19 17:26:24 2006
@@ -2,7 +2,7 @@
 
 %define name	mklivecd
 %define version	0.5.9
-%define release	%mkrel 0.16
+%define release	%mkrel 0.17
 
 %define Summary	Builds a LiveCD from an existing Mandriva Linux installation
 
@@ -14,16 +14,11 @@
 Group:		System/Configuration/Boot and Init
 URL:		http://livecd.berlios.de/
 Source0:	%{name}-%{version}.tar.bz2
-Patch1:     	mklivecd-0.5.9-hw.patch.bz2
-Patch2:     	mklivecd-0.5.9-service.patch.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
-Patch6:         mklivecd-0.5.9-more-sata.patch.bz2
-Patch7:         mklivecd-0.5.9-quiet-mode.patch.bz2
-Patch8:         mklivecd-0.5.9-fix-xkb_n_xdm.patch.bz2
-Patch9:         mklivecd-0.5.9-splash.patch.bz2
-Patch10:	mklivecd-0.5.9-xres.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
 Requires:	busybox cloop-utils mkisofs drakxtools-newt
 Requires:	squashfs-tools mediacheck syslinux zisofs-tools
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -34,23 +29,21 @@
 
 %prep
 %setup -q -n %{name}
-%patch1 -p0 -b .hw
-%patch2 -p0 -b .service
 %patch3 -p0 -b .hotplug
+# (tv) conflict with rc.sysinit:
 %patch4 -p1 -b .umount
 %patch5 -p0 -b .menu
-%patch6 -p1 -b .more-sata
 %patch7 -p0 -b .quiet
-%patch8 -p0 -b .fix_xorg
 %patch9 -p1 -b .splash
-%patch10 -p1 -b .xres
 
 %build
-
-%make
+# use 1024x768 as default resolution like DrakX (some machines dislike 1024x768)
+%make DEF_RESOLUTION=1024x768 DEF_VGAMODE=791
 
 %install
 rm -rf %{buildroot}
+# fix cdrom.ko lookup when building
+perl -pi -e 's! drivers/cdrom/cdrom ! !' dist/mklivecd
 
 %makeinstall_std
 
@@ -60,13 +53,23 @@
 %files
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG FAQ README* TODO
+%{_sbindir}/hwdetect
 %{_sbindir}/mklivecd
-%{_sbindir}/hwdetect
 %{_datadir}/mklivecd/
 
 %changelog
+* 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
+- drop patch 6
+- ditto for patch 8
+- fixed a bug with dhcp & tftp (dirs were deleted by mklivecd) -> in patch keepm
+enu (again)
+- using default resolution of 1024x768
+
 * Thu Feb 16 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.16mdk
-- fixed a bug with dhcp & tftp (dirs were deleted by mklivecd) -> in patch keepmenu.
+- fixed a bug with dhcp & tftp (dirs were deleted by mklivecd) -> in patch keepm
+enu.
 
 * 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)
@@ -85,6 +88,10 @@
 * Mon Feb 06 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.12mdk
 - remove patchs added after v0.5.9-0.9mdk (was too buggy)
 - recompiled for Mandriva 2006
+
+* Thu Oct 13 2005 Pascal Terjan <pterjan at mandriva.org> 0.5.9-0.12mdk
+- patch 10: allow aulologin with something else than KDE (or disabling
+  autologin).
 
 * Fri Sep 09 2005 Thierry Vignaud <tvignaud at mandriva.com> 0.5.9-0.11mdk
 - requires zisofs-tools