From b1f6abc7392edc325a902c28040b7c5f32b325d3 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 28 Sep 2007 07:31:55 +0000
Subject: [PATCH] Reset GCC_RPMREL, GDB_RPMREL, BINUTILS_RPMREL = 1.

---
 contrib/crossrpms/rtems4.9/arm/Makefile.am      | 4 ++--
 contrib/crossrpms/rtems4.9/avr/Makefile.am      | 4 ++--
 contrib/crossrpms/rtems4.9/bfin/Makefile.am     | 4 ++--
 contrib/crossrpms/rtems4.9/h8300/Makefile.am    | 4 ++--
 contrib/crossrpms/rtems4.9/i386/Makefile.am     | 4 ++--
 contrib/crossrpms/rtems4.9/m68k/Makefile.am     | 4 ++--
 contrib/crossrpms/rtems4.9/mips/Makefile.am     | 4 ++--
 contrib/crossrpms/rtems4.9/mipstx39/Makefile.am | 2 +-
 contrib/crossrpms/rtems4.9/powerpc/Makefile.am  | 4 ++--
 contrib/crossrpms/rtems4.9/sh/Makefile.am       | 4 ++--
 contrib/crossrpms/rtems4.9/sparc/Makefile.am    | 4 ++--
 contrib/crossrpms/rtems4.9/tic4x/Makefile.am    | 2 +-
 12 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/contrib/crossrpms/rtems4.9/arm/Makefile.am b/contrib/crossrpms/rtems4.9/arm/Makefile.am
index 59bc9775e3..9847b1bba7 100644
--- a/contrib/crossrpms/rtems4.9/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/arm/Makefile.am
@@ -12,14 +12,14 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 23%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 9%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/avr/Makefile.am b/contrib/crossrpms/rtems4.9/avr/Makefile.am
index c60d3d0806..21153d0c9d 100644
--- a/contrib/crossrpms/rtems4.9/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/avr/Makefile.am
@@ -12,13 +12,13 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.0.3
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 12%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 
 GDB_VERS = 6.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 9%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/bfin/Makefile.am b/contrib/crossrpms/rtems4.9/bfin/Makefile.am
index 6225e33593..6f4872c74b 100644
--- a/contrib/crossrpms/rtems4.9/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/bfin/Makefile.am
@@ -12,13 +12,13 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 23%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 
 GDB_VERS = 6.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/h8300/Makefile.am b/contrib/crossrpms/rtems4.9/h8300/Makefile.am
index 695b81e45a..54776df60b 100644
--- a/contrib/crossrpms/rtems4.9/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/h8300/Makefile.am
@@ -12,14 +12,14 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 23%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 9%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/i386/Makefile.am b/contrib/crossrpms/rtems4.9/i386/Makefile.am
index 095e101cae..f973ad397b 100644
--- a/contrib/crossrpms/rtems4.9/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/i386/Makefile.am
@@ -12,14 +12,14 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 23%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 9%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/m68k/Makefile.am b/contrib/crossrpms/rtems4.9/m68k/Makefile.am
index 540e41f0d8..7fee98b187 100644
--- a/contrib/crossrpms/rtems4.9/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/m68k/Makefile.am
@@ -12,14 +12,14 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 23%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 9%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/mips/Makefile.am b/contrib/crossrpms/rtems4.9/mips/Makefile.am
index a8f98573a8..7402e85220 100644
--- a/contrib/crossrpms/rtems4.9/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/mips/Makefile.am
@@ -12,14 +12,14 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 23%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 9%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am b/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am
index 7bba375dda..73d964d8fc 100644
--- a/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/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.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 9%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
diff --git a/contrib/crossrpms/rtems4.9/powerpc/Makefile.am b/contrib/crossrpms/rtems4.9/powerpc/Makefile.am
index 87061e126f..4d28734688 100644
--- a/contrib/crossrpms/rtems4.9/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/powerpc/Makefile.am
@@ -12,14 +12,14 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 24%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 9%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/sh/Makefile.am b/contrib/crossrpms/rtems4.9/sh/Makefile.am
index 83b03f5c90..524fe210c5 100644
--- a/contrib/crossrpms/rtems4.9/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/sh/Makefile.am
@@ -12,14 +12,14 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 23%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 9%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/sparc/Makefile.am b/contrib/crossrpms/rtems4.9/sparc/Makefile.am
index 3e3bd034aa..8c9e042e11 100644
--- a/contrib/crossrpms/rtems4.9/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/sparc/Makefile.am
@@ -12,14 +12,14 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 23%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/tic4x/Makefile.am b/contrib/crossrpms/rtems4.9/tic4x/Makefile.am
index 35d3890542..ab4bcb0cb6 100644
--- a/contrib/crossrpms/rtems4.9/tic4x/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/tic4x/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 3.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 12%{?dist}
+GCC_RPMREL = 1%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS +=