rpms/openbios/devel openbios-1.0-merge-sbss-into-bss.patch, NONE, 1.1 openbios.spec, 1.3, 1.4 openbios-ppc-nographic.patch, 1.1, NONE

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/openbios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22618

Modified Files:
	openbios.spec 
Added Files:
	openbios-1.0-merge-sbss-into-bss.patch 
Removed Files:
	openbios-ppc-nographic.patch 
Log Message:
* Thu May 21 2009 Mark McLoughlin <markmc at redhat.com> - 1.0-1
- Replace previous attempt to fix bug #494075 with fix from Pavel Roskin
- Drop the 0.x.463 numbering; we are using official upstream 1.0


openbios-1.0-merge-sbss-into-bss.patch:

--- NEW FILE openbios-1.0-merge-sbss-into-bss.patch ---
Put .sbss and .sbss.* into .bss on PowerPC

From: Pavel Roskin <proski at gnu.org>

This is needed on Fedora 11.  Otherwise, qemu reports:

invalid/unsupported opcode: 00 - 18 - 01 (00004070) 00000004 1
invalid/unsupported opcode: 00 - 04 - 17 (000095c8) 000095ec 0
---

 arch/ppc/qemu/ldscript |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/arch/ppc/qemu/ldscript b/arch/ppc/qemu/ldscript
index 66fcbcd..840b498 100644
--- a/arch/ppc/qemu/ldscript
+++ b/arch/ppc/qemu/ldscript
@@ -46,6 +46,8 @@ SECTIONS
 
     .bss ALIGN(4096): {
         _bss = .;
+	*(.sbss)
+	*(.sbss.*)
 	*(.bss)
 	*(.bss.*)
 	*(COMMON)


Index: openbios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbios/devel/openbios.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openbios.spec	14 Apr 2009 17:24:32 -0000	1.3
+++ openbios.spec	21 May 2009 16:01:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		openbios
 Version:	1.0
-Release:	0.6.svn463%{?dist}
+Release:	1%{?dist}
 Summary:	OpenBios implementation of IEEE 1275-1994
 Group:		Applications/Emulators
 License:	GPLv2
@@ -10,7 +10,7 @@ URL:		http://www.openfirmware.info/OpenB
 # tar czvf openbios-1.0.tar.gz openbios-1.0
 Source0:	%{name}/%{name}-%{version}.tar.gz
 Patch0:		openbios-noerror.patch
-Patch1:		openbios-ppc-nographic.patch
+Patch1:		openbios-1.0-merge-sbss-into-bss.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxslt
 
@@ -92,8 +92,7 @@ BuildArch: noarch
 
 %setup -q
 %patch0 -p1
-# -p3, so we don't need to even touch upstream patch
-%patch1 -p3
+%patch1 -p1
 
 %build
 
@@ -156,22 +155,26 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Apr 14 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.6
+* Thu May 21 2009 Mark McLoughlin <markmc at redhat.com> - 1.0-1
+- Replace previous attempt to fix bug #494075 with fix from Pavel Roskin
+- Drop the 0.x.463 numbering; we are using official upstream 1.0
+
+* Tue Apr 14 2009 Glauber Costa <glommer at redhat.com> - 1.0-0.6.463
 - Applied bugfix for #494075
 
-* Wed Mar 04 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.5
+* Wed Mar 04 2009 Glauber Costa <glommer at redhat.com> - 1.0-0.5.463
 - created openbios-common instead of openbios-doc. It owns the directories
   and everybody depends on it.
 
-* Wed Mar 04 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.4
+* Wed Mar 04 2009 Glauber Costa <glommer at redhat.com> - 1.0-0.4.463
 - Addressed comments on BZ 485420. rpmlint provides no error for me,
   added comentaries, and tell how to get the source.
 
-* Tue Mar 03 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.3
+* Tue Mar 03 2009 Glauber Costa <glommer at redhat.com> - 1.0-0.3.463
 - Don't use prebuilt binaries anywhere.
 
 * Fri Feb 13 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.2
 - Addressed comments on BZ 485420: clean build environment, own
   directories we create.
-* Fri Feb 13 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.1
+* Fri Feb 13 2009 Glauber Costa <glommer at redhat.com> - 1.0-0.1.463
 - Created initial build for sparc32/sparc64


--- openbios-ppc-nographic.patch DELETED ---