More RPM spec file tweaking. Looking good now.

BUILDNUM

@@ -1 +1 @@
-126
+132

scripts/comps.xml

@@ -12,7 +12,13 @@
 <packagereq type="default">moxie-elf-gdb</packagereq>
 <packagereq type="default">moxie-elf-gdb-sim</packagereq>
 <packagereq type="default">moxie-elf-newlib</packagereq>
-<packagereq type="default">moxie-elf-qemu</packagereq>
+<packagereq type="default">moxie-qemu</packagereq>
+<packagereq type="default">moxie-rtems-binutils</packagereq>
+<packagereq type="default">moxie-rtems-gcc</packagereq>
+<packagereq type="default">moxie-rtems-gcc-c++</packagereq>
+<packagereq type="default">moxie-rtems-gcc-libstdc++</packagereq>
+<packagereq type="default">moxie-rtems-newlib</packagereq>
+<packagereq type="default">moxie-rtems</packagereq>
 </packagelist>
 </group>
 </comps>

scripts/mkrpms.sh

@@ -3,11 +3,11 @@ set -x
 # For this to work, the mock config file for $TARGET must point to the 
 # local yum repo at $REPO.
 
-CPU=x86_64
-#CPU=i686
+#CPU=x86_64
+CPU=i386
 
-TAG=fc15
-TARGET=fedora-15-$CPU
+TAG=el5
+TARGET=epel-5-$CPU
 RESULTDIR=/var/lib/mock/$TARGET/result
 REPO=dist/MoxieLogic/$TAG
 
@@ -16,7 +16,7 @@ mkdir -p $REPO/RPMS/noarch
 mkdir -p $REPO/SRPMS
 createrepo $REPO
 
-for i in moxie-elf-binutils moxie-elf-gcc moxie-elf-newlib moxie-elf-gdb moxie-elf-qemu moxie-rtems-binutils moxie-rtems-newlib moxie-rtems-gcc moxie-rtems; do
+for i in moxie-elf-binutils moxie-elf-gcc moxie-elf-newlib moxie-elf-gdb moxie-qemu moxie-rtems-binutils moxie-rtems-newlib moxie-rtems-gcc moxie-rtems; do
   mock -r $TARGET dist/$i-[0-9]*src.rpm;
   FILE=`ls $RESULTDIR/$i-*.rpm | head -1`
   if test x$FILE != "x"; then

scripts/mksrpm.sh

@@ -37,10 +37,10 @@ sed -i "s/@VERSION@/4.10.99.0/g" dist/moxie-rtems.spec
 sed -i "s/@DATE@/$DATE/g" dist/moxie-rtems.spec
 sed -i "s/@BUILDNUM@/$BUILDNUM/g" dist/moxie-rtems.spec
 
-cp scripts/moxie-elf-qemu.spec.in dist/moxie-elf-qemu.spec
-sed -i "s/@VERSION@/$QEMU_VERSION/g" dist/moxie-elf-qemu.spec
-sed -i "s/@DATE@/$DATE/g" dist/moxie-elf-qemu.spec
-sed -i "s/@BUILDNUM@/$BUILDNUM/g" dist/moxie-elf-qemu.spec
+cp scripts/moxie-qemu.spec.in dist/moxie-qemu.spec
+sed -i "s/@VERSION@/$QEMU_VERSION/g" dist/moxie-qemu.spec
+sed -i "s/@DATE@/$DATE/g" dist/moxie-qemu.spec
+sed -i "s/@BUILDNUM@/$BUILDNUM/g" dist/moxie-qemu.spec
 cp scripts/moxie-elf-gdb.spec.in dist/moxie-elf-gdb.spec
 sed -i "s/@VERSION@/$GDB_VERSION/g" dist/moxie-elf-gdb.spec
 sed -i "s/@DATE@/$DATE/g" dist/moxie-elf-gdb.spec
@@ -52,9 +52,9 @@ sed -i "s/@BUILDNUM@/$BUILDNUM/g" dist/moxie-elf-gdb.spec
 #sed -i "s/@BUILDNUM@/$BUILDNUM/g" dist/kernel.spec
 
 (cd qemu; make clean > /dev/null 2>&1)
-tar -czf dist/moxie-elf-qemu.tar.gz qemu
+tar -czf dist/moxie-qemu.tar.gz qemu
 
-rpmbuild --nodeps --define "VERSION $QEMU_VERSION" --define "_sourcedir dist" --define "_srcrpmdir dist" -bs dist/moxie-elf-qemu.spec
+rpmbuild --nodeps --define "_source_filedigest_algorithm 0" --define "_binary_filedigest_algorithm 0" --define "VERSION $QEMU_VERSION" --define "_sourcedir dist" --define "_srcrpmdir dist" -bs dist/moxie-qemu.spec
 
 
 tar \
@@ -94,7 +94,7 @@ tar \
 --exclude cloog-ppl \
 -czf dist/moxie-gcc.tar.gz gcc
 
-rpmbuild --nodeps --define "VERSION $GCC_VERSION" --define "_sourcedir dist" --define "_srcrpmdir dist" -bs dist/moxie-$i-gcc.spec
+rpmbuild --nodeps --define "_source_filedigest_algorithm 0" --define "_binary_filedigest_algorithm 0" --define "VERSION $GCC_VERSION" --define "_sourcedir dist" --define "_srcrpmdir dist" -bs dist/moxie-$i-gcc.spec
 
 tar \
 --exclude CVS \
@@ -141,7 +141,7 @@ tar \
 --exclude src/texinfo \
 -czf dist/moxie-newlib.tar.gz src
 
-rpmbuild --nodeps \
+rpmbuild --nodeps --define "_source_filedigest_algorithm 0" --define "_binary_filedigest_algorithm 0" \
 --define "_sourcedir dist" \
 --define "_srcrpmdir dist" \
 -bs dist/moxie-$i-newlib.spec
@@ -151,15 +151,15 @@ done;
 tar \
 -czf dist/rtems.tar.gz rtems
 
-rpmbuild --nodeps \
+rpmbuild --nodeps --define "_source_filedigest_algorithm 0" --define "_binary_filedigest_algorithm 0" \
 --define "_sourcedir dist" \
 --define "_srcrpmdir dist" \
 -bs dist/moxie-rtems.spec
 
 #tar \
 #-czf dist/linux-2.6.tar.gz linux-2.6
 #
-#rpmbuild --nodeps \
+#rpmbuild --nodeps --define "_source_filedigest_algorithm 0" --define "_binary_filedigest_algorithm 0" \
 #--define "_sourcedir dist" \
 #--define "_srcrpmdir dist" \
 #-bs dist/kernel.spec

scripts/moxie-elf-binutils.spec.in

@@ -1,6 +1,6 @@
 Name:		moxie-elf-binutils
 Version:	@VERSION@
-Release:	0.@BUILDNUM@
+Release:	0.@BUILDNUM@%{?dist}
 Summary:	The GNU binutils for the moxie core
 
 Group:		Development/Tools

scripts/moxie-elf-gcc.spec.in

@@ -2,7 +2,7 @@
 
 Name:		moxie-elf-gcc
 Version:	@VERSION@
-Release:	0.@BUILDNUM@
+Release:	0.@BUILDNUM@%{?dist}
 Summary:	The GNU Compiler Collection targeting the moxie core
 
 Group:		Development
@@ -12,7 +12,10 @@ Source0:	moxie-gcc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	moxie-elf-binutils flex bison texinfo gperf 
-BuildRequires:  gmp-devel mpfr-devel libmpc-devel zlib-devel
+BuildRequires:  gmp-devel libmpc-devel zlib-devel
+%if 0%{fedora} > 0 || 0%{rhel} > 5
+BuildRequires: mpfr-devel
+%endif
 Requires:	moxie-elf-binutils
 %if %{with_newlib} == 1
 BuildRequires:	moxie-elf-newlib

scripts/moxie-elf-gdb.spec.in

@@ -1,6 +1,6 @@
 Name:		moxie-elf-gdb
 Version:	@VERSION@
-Release:	0.@BUILDNUM@
+Release:	0.@BUILDNUM@%{?dist}
 Summary:	The GNU gdb for the moxie core
 
 Group:		Development/Tools

scripts/moxie-elf-qemu.spec.in → scripts/moxie-qemu.spec.in

@@ -1,15 +1,15 @@
-Name:		moxie-elf-qemu
+Name:		moxie-qemu
 Version:	@VERSION@
-Release:	0.@BUILDNUM@
+Release:	0.@BUILDNUM@%{?dist}
 Summary:	Qemu port to the moxie architecture
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://moxielogic.com/blog
-Source0:	moxie-elf-qemu.tar.gz
+Source0:	moxie-qemu.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel SDL-devel
-Requires:	qemu
+Requires:	qemu qemu-img
 
 %description
 This is a port of qemu to the moxie core.
@@ -30,6 +30,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/qemu
 rm -f $RPM_BUILD_ROOT%{_bindir}/qemu-img
 rm -f $RPM_BUILD_ROOT%{_bindir}/qemu-nbd
+rm -f $RPM_BUILD_ROOT%{_bindir}/qemu-io
 
 %clean
 rm -rf $RPM_BUILD_ROOT

scripts/moxie-rtems-binutils.spec.in

@@ -1,6 +1,6 @@
 Name:		moxie-rtems-binutils
 Version:	@VERSION@
-Release:	0.@BUILDNUM@
+Release:	0.@BUILDNUM@%{?dist}
 Summary:	The GNU binutils for the moxie core
 
 Group:		Development/Tools

scripts/moxie-rtems-gcc.spec.in

@@ -2,7 +2,7 @@
 
 Name:		moxie-rtems-gcc
 Version:	@VERSION@
-Release:	0.@BUILDNUM@
+Release:	0.@BUILDNUM@%{?dist}
 Summary:	The GNU Compiler Collection targeting the moxie core
 
 Group:		Development
@@ -12,7 +12,10 @@ Source0:	moxie-gcc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	moxie-rtems-binutils flex bison texinfo gperf 
-BuildRequires:  gmp-devel mpfr-devel libmpc-devel zlib-devel
+BuildRequires:  gmp-devel libmpc-devel zlib-devel
+%if 0%{fedora} > 0 || 0%{rhel} > 5
+BuildRequires: mpfr-devel
+%endif
 Requires:	moxie-rtems-binutils
 %if %{with_newlib} == 1
 BuildRequires:	moxie-rtems-newlib

scripts/moxie-rtems-gdb.spec.in

@@ -1,6 +1,6 @@
 Name:		moxie-rtems-gdb
 Version:	@VERSION@
-Release:	0.@BUILDNUM@
+Release:	0.@BUILDNUM@%{?dist}
 Summary:	The GNU gdb for the moxie core
 
 Group:		Development/Tools

scripts/moxie-rtems.spec.in

@@ -4,7 +4,7 @@
 
 Name:		moxie-rtems
 Version:	@VERSION@
-Release:	0.@BUILDNUM@
+Release:	0.@BUILDNUM@%{?dist}
 Summary:	RTEMS port for the moxie processor core
 
 Group:		Development/Tools