rpms/pungi/F-9 0001-add-handling-of-sparc-arch.-make-sure-all-the-packag.patch, NONE, 1.1 pungi.spec, 1.55, 1.56

[Dennis Gilmore]

Author: ausil

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

Modified Files:
	pungi.spec 
Added Files:
	0001-add-handling-of-sparc-arch.-make-sure-all-the-packag.patch 
Log Message:
handle sparc correctly


0001-add-handling-of-sparc-arch.-make-sure-all-the-packag.patch:

--- NEW FILE 0001-add-handling-of-sparc-arch.-make-sure-all-the-packag.patch ---
>From 8a3b4e7fa1c02e9ac88678eb31721451672fc022 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Wed, 15 Oct 2008 20:32:12 -0500
Subject: [PATCH] add handling of sparc arch. make sure all the packages end up in the tree

---
 src/pypungi/pungi.py |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/pypungi/pungi.py b/src/pypungi/pungi.py
index 1b22418..452140a 100755
--- a/src/pypungi/pungi.py
+++ b/src/pypungi/pungi.py
@@ -173,13 +173,18 @@ class Pungi(pypungi.PungiBase):
     def doPackageorder(self):
         """Run anaconda-runtime's pkgorder on the tree, used for splitting media."""
 
+        if self.config.get('default', 'arch') == "sparc":
+            treearch = "sparcv9v"
+        else:
+            treearch = self.config.get('default', 'arch')
+        self.logger.info("Setting treearch to %s" % treearch)
 
         pkgorderfile = open(os.path.join(self.workdir, 'pkgorder-%s' % self.config.get('default', 'arch')), 'w')
         # setup the command
         pkgorder = ['/usr/lib/anaconda-runtime/pkgorder']
         #pkgorder.append('TMPDIR=%s' % self.workdir)
         pkgorder.append(self.topdir)
-        pkgorder.append(self.config.get('default', 'arch'))
+        pkgorder.append(treearch)
         pkgorder.append(self.config.get('default', 'product_path'))
 
         # run the command
@@ -249,9 +254,14 @@ class Pungi(pypungi.PungiBase):
         """Use anaconda-runtime's splittree to split the tree into appropriate
            sized chunks."""
 
+        if self.config.get('default', 'arch') == "sparc":
+            treearch = "sparcv9v"
+        else:
+            treearch = self.config.get('default', 'arch') 
+        self.logger.info("Setting treearch to %s" % treearch)
 
         timber = splittree.Timber()
-        timber.arch = self.config.get('default', 'arch')
+        timber.arch = treearch
         timber.target_size = self.config.getfloat('default', 'cdsize') * 1024 * 1024
         timber.total_discs = self.config.getint('default', 'discs')
         timber.bin_discs = self.config.getint('default', 'discs')
@@ -274,9 +284,14 @@ class Pungi(pypungi.PungiBase):
         """Use anaconda-runtime's splittree to split the srpms into appropriate
            sized chunks."""
 
+        if self.config.get('default', 'arch') == "sparc":
+            treearch = "sparcv9v"
+        else:
+            treearch = self.config.get('default', 'arch')
+        self.logger.info("Setting treearch to %s" % treearch)
 
         timber = splittree.Timber()
-        timber.arch = self.config.get('default', 'arch')
+        timber.arch = treearch
         #timber.total_discs = self.config.getint('default', 'discs')
         #timber.bin_discs = self.config.getint('default', 'discs')
         timber.src_discs = self.config.getint('default', 'discs')
-- 
1.6.0.1



Index: pungi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pungi/F-9/pungi.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- pungi.spec	16 Jun 2008 21:44:42 -0000	1.55
+++ pungi.spec	16 Oct 2008 02:15:27 -0000	1.56
@@ -2,13 +2,14 @@
 
 Name:           pungi
 Version:        1.2.18.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Distribution compose tool
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            https://fedorahosted.org/pungi
 Source0:        https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
+Patch0:         0001-add-handling-of-sparc-arch.-make-sure-all-the-packag.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       anaconda-runtime >= 11.4.0.67, yum => 3.2.13, repoview, createrepo >= 0.4.11, pykickstart => 1.36
 BuildRequires:  python-devel
@@ -21,7 +22,7 @@
 
 %prep
 %setup -q
-
+%patch -p1
 
 %build
 %{__python} setup.py build
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Wed Oct 15 2008 Dennis Gilmore <dennis at ausil.us> - 1.2.18.1-2
+- add patch to get sparc right
+
 * Mon Jun 16 2008 Jesse Keating <jkeating at redhat.com> - 1.2.18.1-1
 - Fix for pykickstart moving from 'priority' to 'cost'.