rpms/anaconda/F-9 anaconda-11.4.0.83-more-sparc-fixes.patch, 1.5, 1.6 anaconda.spec, 1.691, 1.692

Tom Callaway spot at fedoraproject.org
Sat Oct 4 16:06:34 UTC 2008


Author: spot

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

Modified Files:
	anaconda-11.4.0.83-more-sparc-fixes.patch anaconda.spec 
Log Message:
one more pkgorder fix, drop patch suffix

anaconda-11.4.0.83-more-sparc-fixes.patch:

Index: anaconda-11.4.0.83-more-sparc-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda-11.4.0.83-more-sparc-fixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- anaconda-11.4.0.83-more-sparc-fixes.patch	4 Oct 2008 15:52:04 -0000	1.5
+++ anaconda-11.4.0.83-more-sparc-fixes.patch	4 Oct 2008 16:06:33 -0000	1.6
@@ -179,6 +179,18 @@
  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


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -r1.691 -r1.692
--- anaconda.spec	4 Oct 2008 15:52:04 -0000	1.691
+++ anaconda.spec	4 Oct 2008 16:06:33 -0000	1.692
@@ -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 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .spot
+%patch0 -p1
 
 %build
 %{__make} depend
@@ -214,6 +214,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Sat Oct 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-7
+- one more pkgorder fix, drop patch suffix
+
 * Sat Oct 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-6
 - simplify sparc specific bits, this actually works (mostly)
 




More information about the scm-commits mailing list