rpms/ppc64-utils/devel .cvsignore, 1.4, 1.5 ppc64-utils.spec, 1.22, 1.23 sources, 1.9, 1.10

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/ppc64-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7595

Modified Files:
	.cvsignore ppc64-utils.spec sources 
Log Message:
Add PS3 utils


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Nov 2006 09:26:04 -0000	1.4
+++ .cvsignore	31 Mar 2007 03:26:54 -0000	1.5
@@ -5,3 +5,4 @@
 powerpc-utils-papr-1.0.2.tar.gz
 powerpc-utils-1.0.3.tar.gz
 powerpc-utils-papr-1.0.3.tar.gz
+ps3pf_utils-1.0.9.tar.bz2


Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ppc64-utils.spec	7 Nov 2006 09:26:04 -0000	1.22
+++ ppc64-utils.spec	31 Mar 2007 03:26:54 -0000	1.23
@@ -1,22 +1,24 @@
 %define pmacutilsver 2.1
-%define ppc64utilsver 1.1
 %define powerpcutilsver 1.0.3
+%define ps3pfutilsver 1.0.9
 
 Summary: Linux/PPC64 specific utilities
 Name: ppc64-utils
 Version: 0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL and OSL
 Group: System Environment/Base
-Source0: powerpc-utils-%{powerpcutilsver}.tar.gz
+Source0: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{powerpcutilsver}.tar.gz
 Source1: addRamDisk.c
 Source2: addSystemMap.c
 Source3: mkzimage
 Source5: pmac-utils-%{pmacutilsver}.tar.gz
 Source6: zImage-boot.tar.gz
-Source7: powerpc-utils-papr-%{powerpcutilsver}.tar.gz
+Source7: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-%{powerpcutilsver}.tar.gz
+Source8: http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3pf_utils-%{ps3pfutilsver}.tar.bz2
 Patch0: pmac-utils-0.4-cell.patch
 Patch1: ppc64-utils-1.1-64k.patch
+Patch2: ps3pf_utils-1.0.9-types.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 ExclusiveArch: ppc ppc64
@@ -25,16 +27,18 @@
 BuildRequires: librtas-devel
 Provides: powerpc-utils = %{powerpcutilsver}
 Provides: powerpc-utils-papr = %{powerpcutilsver}
+Provides: ps3pf-utils = %{ps3pfutilsver}
+Obsoletes: ps3pf_utils <= 1.0.9-3
 
 %description
 A collection of utilities for Linux on PPC64 platforms.
 
 %prep
-%setup -n powerpc-utils-%{powerpcutilsver} -a 5 -a 6 -a 7
+%setup -n powerpc-utils-%{powerpcutilsver} -a 5 -a 6 -a 7 -a 8
 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 %patch0 -p0 -b .cell
 %patch1 -p1 -b .64k
-
+%patch2 -p0
 %build
 make
 find -type f -exec perl -pi -e "s,/usr/sbin/ibmras,%{_sbindir},g" {} \;
@@ -43,6 +47,7 @@
 make -C pmac-utils-%{pmacutilsver} clean nvsetenv nvsetenv.8
 CFLAGS="$RPM_OPT_FLAGS" make -C powerpc-utils-papr-%{powerpcutilsver}
 make -C zImage-boot zImage.stub
+make -C ps3pf_utils-%{ps3pfutilsver}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,7 +70,7 @@
 rm -rf $RPM_BUILD_ROOT/etc/init.d
 install -m 644 scripts/ibmvscsis.sh $RPM_BUILD_ROOT/usr/share/ppc64-utils
 popd
-
+make -C ps3pf_utils-%{ps3pfutilsver} DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT/%{_docdir}/packages
 
 %clean
@@ -74,15 +79,16 @@
 %files
 %defattr(-,root,root,-)
 %doc README COPYRIGHT
-/sbin/addRamDisk
-/sbin/addSystemMap
-/sbin/nvsetenv
+/sbin/*
 %{_sbindir}/*
 %{_bindir}/*
 /usr/share/ppc64-utils/
 %{_mandir}/man8/*
 
 %changelog
+* Sat Mar 31 2007 David Woodhouse <dwmw2 at redhat.com> - 0.11-2
+- Include ps3pf_utils.
+
 * Mon Oct 30 2006 Paul Nasrat <pnasrat at redhat.com> - 0.11-1
 - Update powerpc-utils to 1.0.3 (#212181)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Nov 2006 09:26:04 -0000	1.9
+++ sources	31 Mar 2007 03:26:54 -0000	1.10
@@ -2,3 +2,4 @@
 1e3f958ea6d0b7313a3aee174e472138  zImage-boot.tar.gz
 ffd031d0b949bef79a57159ecc235d3f  powerpc-utils-1.0.3.tar.gz
 19ae37d109ccafa4feeb714925b022b1  powerpc-utils-papr-1.0.3.tar.gz
+0a7cccf1de3287e669898e3f41cddf3e  ps3pf_utils-1.0.9.tar.bz2