Reset *_RPMREL.

12 files changed, 44 insertions, 44 deletions

diff --git a/contrib/crossrpms/rtems4.10/arm/Makefile.am b/contrib/crossrpms/rtems4.10/arm/Makefile.am
index f400bc002a..6c209d199e 100644
--- a/contrib/crossrpms/rtems4.10/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/arm/Makefile.am
@@ -6,25 +6,25 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 CPUKIT_VERS = 4.7.99.1
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-CPUKIT_RPMREL = 0
+CPUKIT_RPMREL = 1%{?dist}
 include ../cpukit.am
 CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/avr/Makefile.am b/contrib/crossrpms/rtems4.10/avr/Makefile.am
index 992d20e879..0d699d97d0 100644
--- a/contrib/crossrpms/rtems4.10/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/avr/Makefile.am
@@ -6,25 +6,25 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS +=
 
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 CPUKIT_VERS = 4.7.99.1
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-CPUKIT_RPMREL = 0
+CPUKIT_RPMREL = 1%{?dist}
 include ../cpukit.am
 CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/bfin/Makefile.am b/contrib/crossrpms/rtems4.10/bfin/Makefile.am
index a013f81568..802c2bd8bb 100644
--- a/contrib/crossrpms/rtems4.10/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/bfin/Makefile.am
@@ -6,26 +6,26 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS +=
 
 GDB_VERS = 6.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 4%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 ### bfin's GCC is too broken to be usable
 ## CPUKIT_VERS = 4.7.99.1
 ## CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-## CPUKIT_RPMREL = 0
+## CPUKIT_RPMREL = 1%{?dist}
 ## include ../cpukit.am
 ## CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/h8300/Makefile.am b/contrib/crossrpms/rtems4.10/h8300/Makefile.am
index b5b9f28665..2b3582f16a 100644
--- a/contrib/crossrpms/rtems4.10/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/h8300/Makefile.am
@@ -6,25 +6,25 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 CPUKIT_VERS = 4.7.99.1
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-CPUKIT_RPMREL = 0
+CPUKIT_RPMREL = 1%{?dist}
 include ../cpukit.am
 CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/i386/Makefile.am b/contrib/crossrpms/rtems4.10/i386/Makefile.am
index 1d2e2e6739..2f0c1d323e 100644
--- a/contrib/crossrpms/rtems4.10/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/i386/Makefile.am
@@ -6,25 +6,25 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 CPUKIT_VERS = 4.7.99.1
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-CPUKIT_RPMREL = 0
+CPUKIT_RPMREL = 1%{?dist}
 include ../cpukit.am
 CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/m68k/Makefile.am b/contrib/crossrpms/rtems4.10/m68k/Makefile.am
index 7986d999b4..17e81a5798 100644
--- a/contrib/crossrpms/rtems4.10/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m68k/Makefile.am
@@ -6,25 +6,25 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}.1
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 CPUKIT_VERS = 4.7.99.1
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-CPUKIT_RPMREL = 0
+CPUKIT_RPMREL = 1%{?dist}
 include ../cpukit.am
 CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/mips/Makefile.am b/contrib/crossrpms/rtems4.10/mips/Makefile.am
index e492ec4931..a6840a4774 100644
--- a/contrib/crossrpms/rtems4.10/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/mips/Makefile.am
@@ -6,25 +6,25 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 CPUKIT_VERS = 4.7.99.1
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-CPUKIT_RPMREL = 0
+CPUKIT_RPMREL = 1%{?dist}
 include ../cpukit.am
 CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am b/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am
index e0e1f866ac..53e8e06497 100644
--- a/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am
@@ -7,6 +7,6 @@ include $(top_srcdir)/mkspec.am
 # We only want a gdb with a tx39 simulator in it.  We share the other tools
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am
index 2db8e5d593..efa3e006bb 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am
@@ -6,25 +6,25 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 CPUKIT_VERS = 4.7.99.1
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-CPUKIT_RPMREL = 0
+CPUKIT_RPMREL = 1%{?dist}
 include ../cpukit.am
 CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/sh/Makefile.am b/contrib/crossrpms/rtems4.10/sh/Makefile.am
index aa510520ed..3c5a2c9bc1 100644
--- a/contrib/crossrpms/rtems4.10/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/sh/Makefile.am
@@ -6,25 +6,25 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 CPUKIT_VERS = 4.7.99.1
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-CPUKIT_RPMREL = 0
+CPUKIT_RPMREL = 1%{?dist}
 include ../cpukit.am
 CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/sparc/Makefile.am b/contrib/crossrpms/rtems4.10/sparc/Makefile.am
index d87880424b..93087be864 100644
--- a/contrib/crossrpms/rtems4.10/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/sparc/Makefile.am
@@ -6,25 +6,25 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.8
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
 CPUKIT_VERS = 4.7.99.1
 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-CPUKIT_RPMREL = 0
+CPUKIT_RPMREL = 1%{?dist}
 include ../cpukit.am
 CPUKIT_OPTS +=
diff --git a/contrib/crossrpms/rtems4.10/tic4x/Makefile.am b/contrib/crossrpms/rtems4.10/tic4x/Makefile.am
index ada777c2e6..f8aaf70d10 100644
--- a/contrib/crossrpms/rtems4.10/tic4x/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/tic4x/Makefile.am
@@ -6,13 +6,13 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 4%{?dist}
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 3.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 8%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.16.0
 include ../gcc.am
 GCC_OPTS +=
@@ -20,6 +20,6 @@ GCC_OPTS +=
 ### rtems doesn't build for the tic4x
 ## CPUKIT_VERS = 4.7.99.1
 ## CPUKIT_PKGVERS = $(CPUKIT_VERS)-20070510
-## CPUKIT_RPMREL = 0
+## CPUKIT_RPMREL = 1%{?dist}
 ## include ../cpukit.am
 ## CPUKIT_OPTS +=