rpms/yaboot/devel yaboot-1.3.13-bplan.patch, 1.2, 1.3 yaboot.spec, 1.45, 1.46

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/yaboot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9400

Modified Files:
	yaboot-1.3.13-bplan.patch yaboot.spec 
Log Message:
Don't fuck with the partition number when the user gave conf= on the 
command line.


yaboot-1.3.13-bplan.patch:

Index: yaboot-1.3.13-bplan.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/yaboot-1.3.13-bplan.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yaboot-1.3.13-bplan.patch	28 Nov 2007 13:20:47 -0000	1.2
+++ yaboot-1.3.13-bplan.patch	27 Mar 2008 23:09:10 -0000	1.3
@@ -118,7 +118,7 @@
  	  prom_printf("%s: Unable to parse\n", bootdevice);
  	  return -1;
       }
-+     if (_machine == _MACH_bplan)
++     if (_machine == _MACH_bplan && !conf_given)
 +	  boot.part++;
       DEBUG_F("After parse_device_path: dev=%s, part=%d, file=%s\n",
  	     boot.dev, boot.part, boot.file);


Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- yaboot.spec	8 Feb 2008 21:59:29 -0000	1.45
+++ yaboot.spec	27 Mar 2008 23:09:10 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -120,6 +120,10 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Thu Mar 27 2008 David Woodhouse <dwmw2 at redhat.com> - 1.3.13-10
+- Don't increment partition number to work around bplan firmware 
+  brokenness when the config file was specified on the command line
+
 * Fri Feb 08 2008 David Cantrell <dcantrell at redhat.com> - 1.3.13-9
 - Rebuild for gcc-4.3