rpms/ppc64-utils/devel .cvsignore, 1.7, 1.8 ppc64-utils.spec, 1.30, 1.31 sources, 1.14, 1.15
David Woodhouse (dwmw2)
fedora-extras-commits at redhat.com
Wed Nov 28 02:15:10 UTC 2007
Author: dwmw2
Update of /cvs/pkgs/rpms/ppc64-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14413
Modified Files:
.cvsignore ppc64-utils.spec sources
Log Message:
remove powerpc-utils, powerpc-utils-papr, ps3pf-utils
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 15 Sep 2007 21:13:30 -0000 1.7
+++ .cvsignore 28 Nov 2007 02:14:36 -0000 1.8
@@ -1,8 +1,4 @@
-pmac-utils-2.1.tar.gz
-ppc64-utils-0.4.tar.gz
zImage-boot.tar.gz
-ps3pf_utils-1.0.9.tar.bz2
zImage-wrapper.tar.gz
ps3.dtb
-powerpc-utils-1.0.6.tar.gz
-powerpc-utils-papr-1.0.4.tar.gz
+ppc64-utils.tar.gz
Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ppc64-utils.spec 23 Oct 2007 17:38:16 -0000 1.30
+++ ppc64-utils.spec 28 Nov 2007 02:14:36 -0000 1.31
@@ -1,102 +1,66 @@
-%define pmacutilsver 2.1
-%define powerpcutilsver 1.0.6
-%define powerpcutilspaprver 1.0.4
-%define ps3pfutilsver 1.0.9
Summary: Linux/PPC64 specific utilities
Name: ppc64-utils
-Version: 0.12
-Release: 3%{?dist}
+Version: 0.13
+Release: 1%{?dist}
# The things that do not have URLs in the source entry are Red Hat creations,
# except pmac-utils, which just isn't available upstream anymore.
# The licensing of these things are all different. The Red Hat
# creations are either GPLv2 or GPLv2+, pmac-utils is GPLv2, and
# powerpc-utils and powerpc-utils-papr are IBM
-License: GPLv2 and GPLv2+ and IBM
+License: GPLv2
Group: System Environment/Base
-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
+Source0: ppc64-utils.tar.gz
Source6: zImage-boot.tar.gz
-Source7: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-%{powerpcutilspaprver}.tar.gz
-Source8: http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3pf_utils-%{ps3pfutilsver}.tar.bz2
Source9: zImage-wrapper.tar.gz
Source10: ps3.dts
Source11: ofboot.b
Source12: bootinfo.txt
Source13: mapping
-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}-root-%(%{__id_u} -n)
ExclusiveArch: ppc ppc64
Requires: binutils yaboot
BuildRequires: linuxdoc-tools librtas-devel kernel-devel dtc
-Provides: powerpc-utils = %{powerpcutilsver}
-Provides: powerpc-utils-papr = %{powerpcutilsver}
-Provides: ps3pf-utils = %{ps3pfutilsver}
-Obsoletes: ps3pf_utils <= 1.0.9-3
+Requires: powerpc-utils powerpc-utils-papr ps3pf-utils
%description
A collection of utilities for Linux on PPC64 platforms.
%prep
-%setup -n powerpc-utils-%{powerpcutilsver} -a 5 -a 6 -a 7 -a 8 -a 9
-%{__cp} %{SOURCE1} %{SOURCE2} %{SOURCE3} .
-%patch0 -p0 -b .cell
+%setup -n ppc64-utils -a 6 -a 9
%patch1 -p1 -b .64k
-%patch2 -p0
%build
-%{__make} %{?_smp_mflags}
find -type f -exec %{__perl} -pi -e "s,/usr/sbin/ibmras,%{_sbindir},g" {} \;
%{__cc} -O -fno-builtin -DSTDC_HEADERS addRamDisk.c -o addRamDisk
%{__cc} -O -fno-builtin -DSTDC_HEADERS addSystemMap.c -o addSystemMap
-%{__make} -C pmac-utils-%{pmacutilsver} clean nvsetenv nvsetenv.8
-
-CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} -C powerpc-utils-papr-%{powerpcutilspaprver}
-
%{__make} %{?_smp_mflags} -C zImage-boot zImage.stub
KVER="$(ls -1 /usr/src/kernels | head -n 1)"
KINCLUDES="/usr/src/kernels/${KVER}/include"
%{__make} %{?_smp_mflags} -C zImage-wrapper CFLAGS="%{optflags} -I${KINCLUDES}"
-%{__make} %{?_smp_mflags} -C ps3pf_utils-%{ps3pfutilsver} CFLAGS="%{optflags} -I${KINCLUDES}"
dtc -O dtb %{SOURCE10} -o ps3.dtb
%install
%{__rm} -rf %{buildroot}
-%{__make} LIB_DIR=%{_libdir} DESTDIR=%{buildroot} install
%{__mkdir} -p %{buildroot}/sbin
%{__mkdir} -p %{buildroot}%{_bindir}
-%{__mkdir} -p %{buildroot}%{_mandir}/man8
%{__mkdir} -p %{buildroot}%{_datadir}/%{name}
%{__install} -m 755 mkzimage %{buildroot}/%{_bindir}
%{__install} -m 755 addRamDisk %{buildroot}/sbin
%{__install} -m 755 addSystemMap %{buildroot}/sbin
%{__install} -m 644 zImage-boot/zImage.lds %{buildroot}%{_datadir}/%{name}
%{__install} -m 644 zImage-boot/zImage.stub %{buildroot}%{_datadir}/%{name}
-pushd pmac-utils-%{pmacutilsver}
-%{__install} -m 755 nvsetenv %{buildroot}/sbin
-%{__install} -m 755 nvsetenv.8 %{buildroot}/%{_mandir}/man8
-popd
-pushd powerpc-utils-papr-%{powerpcutilspaprver}
-%{__make} LIB_DIR=%{_libdir} DESTDIR=%{buildroot} install
-%{__rm} -rf %{buildroot}/etc/init.d
-%{__install} -m 0644 scripts/ibmvscsis.sh %{buildroot}%{_datadir}/%{name}
-popd
%{__make} -C zImage-wrapper DESTDIR=%{buildroot} install
-%{__make} -C ps3pf_utils-%{ps3pfutilsver} DESTDIR=%{buildroot} install
%{__install} -m 0644 %{SOURCE10} ps3.dtb %{buildroot}%{_datadir}/%{name}
%{__rm} -rf %{buildroot}/%{_docdir}/packages
@@ -109,14 +73,15 @@
%files
%defattr(-,root,root,-)
-%doc README COPYRIGHT
/sbin/*
%{_sbindir}/*
%{_bindir}/*
%{_datadir}/%{name}/
-%{_mandir}/man8/*
%changelog
+* Wed Nov 28 2007 David Woodhouse <dwmw2 at redhat.com> 0.13-1
+- Remove powerpc-utils, powerpc-utils-papr, ps3pf-utils
+
* Tue Oct 23 2007 Jeremy Katz <katzj at redhat.com> - 0.12-3
- and one more file is needed
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 15 Sep 2007 21:13:30 -0000 1.14
+++ sources 28 Nov 2007 02:14:36 -0000 1.15
@@ -1,7 +1,4 @@
-afbdcb97cd036f0c55204e05bac5f38e pmac-utils-2.1.tar.gz
1e3f958ea6d0b7313a3aee174e472138 zImage-boot.tar.gz
-0a7cccf1de3287e669898e3f41cddf3e ps3pf_utils-1.0.9.tar.bz2
787839c782f8ab9812903cfb501455c8 ps3.dtb
cbef15544b5335e8a646d497456f3313 zImage-wrapper.tar.gz
-33de4697b9dc36be070ae67d545fd4fe powerpc-utils-1.0.6.tar.gz
-1472a4b2c6929a5bfe0d29ff30e8b559 powerpc-utils-papr-1.0.4.tar.gz
+b475b7388cc22895290416646c0ba038 ppc64-utils.tar.gz
More information about the fedora-extras-commits
mailing list