rpms/anaconda/F-9 anaconda-11.4.0.83-sparc-upd-instroot-nov9vforglibc.patch, NONE, 1.1 anaconda.spec, 1.694, 1.695 anaconda-11.4.0.83-DEBUG.patch, 1.1, NONE

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/anaconda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4766

Modified Files:
	anaconda.spec 
Added Files:
	anaconda-11.4.0.83-sparc-upd-instroot-nov9vforglibc.patch 
Removed Files:
	anaconda-11.4.0.83-DEBUG.patch 
Log Message:
fix upd-instroot to only pull in sparcv9 for glibc, openssl && drop debugging patch

anaconda-11.4.0.83-sparc-upd-instroot-nov9vforglibc.patch:

--- NEW FILE anaconda-11.4.0.83-sparc-upd-instroot-nov9vforglibc.patch ---
diff -up anaconda-11.4.0.83/scripts/upd-instroot.BAD anaconda-11.4.0.83/scripts/upd-instroot
--- anaconda-11.4.0.83/scripts/upd-instroot.BAD	2008-12-11 16:29:16.000000000 -0500
+++ anaconda-11.4.0.83/scripts/upd-instroot	2008-12-11 16:30:18.000000000 -0500
@@ -169,6 +169,8 @@ PACKAGES="glibc-common setup python newt
 
 if [ $ARCH = i386 ]; then
     PACKAGES="$PACKAGES glibc.i386 openssl.i386"
+elif [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
+    PACKAGES="$PACKAGES glibc.sparcv9 openssl.sparcv9"
 else
     PACKAGES="$PACKAGES glibc openssl"
 fi


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- anaconda.spec	15 Oct 2008 21:07:59 -0000	1.694
+++ anaconda.spec	11 Dec 2008 21:42:12 -0000	1.695
@@ -3,14 +3,14 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.4.0.83
-Release: 8.1
+Release: 9
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
 
 Source0: anaconda-%{version}.tar.bz2
 Patch0: anaconda-11.4.0.83-more-sparc-fixes.patch
-Patch1: anaconda-11.4.0.83-DEBUG.patch
+Patch1: anaconda-11.4.0.83-sparc-upd-instroot-nov9vforglibc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: sparc64
@@ -153,7 +153,7 @@
 %prep
 %setup -q
 %patch0 -p1
-# We're debugging the loader on SPARC, as it appears to be dying very early.
+# Fix upd-instroot to force sparcv9 for glibc and openssl
 %patch1 -p1
 
 %build
@@ -217,6 +217,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Dec 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-9 
+- Fix upd-instroot to force sparcv9 for glibc and openssl
+- drop debugging patch
+
 * Wed Oct 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-8.1
 - debugging the loader to troubleshoot sparc problems, temporary patch
 


--- anaconda-11.4.0.83-DEBUG.patch DELETED ---