From c62ffb43f29bb28602ba8bdae1b7a4374572b8f8 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Oct 04 2008 16:06:33 +0000 Subject: one more pkgorder fix, drop patch suffix --- diff --git a/anaconda-11.4.0.83-more-sparc-fixes.patch b/anaconda-11.4.0.83-more-sparc-fixes.patch index 6258982..a0ae37f 100644 --- a/anaconda-11.4.0.83-more-sparc-fixes.patch +++ b/anaconda-11.4.0.83-more-sparc-fixes.patch @@ -179,6 +179,18 @@ diff -up anaconda-11.4.0.83/scripts/mk-images.spot anaconda-11.4.0.83/scripts/mk fi foundakernel="" +diff -up anaconda-11.4.0.83/scripts/pkgorder.spot anaconda-11.4.0.83/scripts/pkgorder +--- anaconda-11.4.0.83/scripts/pkgorder.spot 2008-10-04 12:01:59.000000000 -0400 ++++ anaconda-11.4.0.83/scripts/pkgorder 2008-10-04 12:02:28.000000000 -0400 +@@ -71,7 +71,7 @@ class PackageOrderer(yum.YumBase): + self.doRepoSetup() + + # We have to hack this in here, otherwise, we won't get sparc64v, sparcv9v +- if arch.startswith("sparc64"): ++ if arch.startswith("sparc64") or arch.startswith("sparcv9"): + self.arch = "sparc64v" + self.doSackSetup(rpmUtils.arch.getArchList(self.arch)) + self.doTsSetup() diff -up anaconda-11.4.0.83/scripts/upd-instroot.spot anaconda-11.4.0.83/scripts/upd-instroot --- anaconda-11.4.0.83/scripts/upd-instroot.spot 2008-10-01 21:32:11.000000000 -0400 +++ anaconda-11.4.0.83/scripts/upd-instroot 2008-10-03 15:59:05.000000000 -0400 diff --git a/anaconda.spec b/anaconda.spec index 8f2af73..ebb5242 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 11.4.0.83 -Release: 6 +Release: 7 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -151,7 +151,7 @@ sets, but are not meant for use on already installed systems. %prep %setup -q -%patch0 -p1 -b .spot +%patch0 -p1 %build %{__make} depend @@ -214,6 +214,9 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Sat Oct 04 2008 Tom "spot" Callaway - 11.4.0.83-7 +- one more pkgorder fix, drop patch suffix + * Sat Oct 04 2008 Tom "spot" Callaway - 11.4.0.83-6 - simplify sparc specific bits, this actually works (mostly)