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

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:25:53 2006
New Revision: 7874

URL: http://svn.erp5.org?rev=7874&view=rev
Log:
Commit mklivecd-0.5.9-0.12mdk 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=7874&r1=7873&r2=7874&view=diff
==============================================================================
--- spec/mandriva/2006.0/mklivecd/mklivecd.spec (original)
+++ spec/mandriva/2006.0/mklivecd/mklivecd.spec Mon Jun 19 17:25:53 2006
@@ -2,9 +2,9 @@
 
 %define name	mklivecd
 %define version	0.5.9
-%define release	0.10mdk
+%define release	%mkrel 0.12
 
-%define Summary	Builds a LiveCD from an existing Mandrakelinux installation
+%define Summary	Builds a LiveCD from an existing Mandriva Linux installation
 
 Summary:	%{Summary}
 Name:		%{name}
@@ -18,7 +18,7 @@
 Patch2:     	mklivecd-0.5.9-service.patch.bz2
 Patch3:     	mklivecd-0.5.9-ln_s.patch.bz2
 Requires:	busybox cloop-utils mkisofs drakxtools-newt
-Requires:	squashfs-tools mediacheck
+Requires:	squashfs-tools mediacheck syslinux zisofs-tools
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Buildarch:	noarch
 
@@ -32,13 +32,15 @@
 %patch3 -p0
 
 %build
-%make
+# use 800x600 as default resolution like DrakX (some machines dislike 1024x768)
+%make DEF_RESOLUTION=800x600 DEF_VGAMODE=788
 
 %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
+rm -f $RPM_BUILD_ROOT%{_sbindir}/hwdetect
 
 %clean
 rm -rf %{buildroot}
@@ -47,15 +49,37 @@
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG FAQ README* TODO
 %{_sbindir}/mklivecd
-%{_sbindir}/hwdetect
 %{_datadir}/mklivecd/
 
 %changelog
-* Fri Feb 3 2006 Christophe DUMEZ <christophe at nexedi.com> 0.5.9-0.10mdk
-- rebuilt for Mandriva 2006
+* 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
 
-* Fri Sep  2 2005 Yoshinori Okuji <yo at nexedi.com> 0.5.9-0.9mdk
-- fix the symbolic links for keyboard configuration
+* Fri Sep 09 2005 Thierry Vignaud <tvignaud at mandriva.com> 0.5.9-0.11mdk
+- requires zisofs-tools
+- don't package hwdetect, harddrake is enabled at boot and does a better job
+  (hwdetect just broke snd_intel8x0 for example) (blino)
+- use 800x600 as default resolution like DrakX since some machines
+  dislike 1024x768 (blino)
+- patch 3: fix build w/o hotplug since it's no more mandatory
+- patch 4: quiet umount of /proc
+- patch 5: keep builded menus on live image
+- patch 6:
+  o handle more SATA controllers
+  o add sata support for ahci/ata_piix in initrd as well (blino)
+  o don't break scsi modules list with misplaced comments (blino)
+  o don't try to use inexistent qlogicisp (blino)
+- patch 7: let perl be quiet by default
+- patch 8: don't break XKB and XDM
+- patch 9: allow splash=silent and splash=verbose options
+  (splash=yes didn't make much sense) (blino)
+
+* Wed Jun 01 2005 Lenny Cartier <lenny at mandriva.com> 0.5.9-0.10mdk
+- fix summary & desc (thx Zero_Dogg)
+
+* Tue May 31 2005 Lenny Cartier <lenny at mandriva.com> 0.5.9-0.9mdk
+- requires syslinux
 
 * Tue Mar 22 2005 Nicolas Lécureuil <neoclust at mandrake.org> 0.5.9-0.8mdk
 - rebuild