Move %{?dist} into GCC_RPMREL.

19 files changed, 19 insertions, 19 deletions

diff --git a/contrib/crossrpms/cygwin/i686/Makefile.am b/contrib/crossrpms/cygwin/i686/Makefile.am
index 9d24a0a60e..8e68251777 100644
--- a/contrib/crossrpms/cygwin/i686/Makefile.am
+++ b/contrib/crossrpms/cygwin/i686/Makefile.am
@@ -111,6 +111,6 @@ BINUTILS_OPTS += --disable-infos
 
 GCC_VERS = 3.4.4
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20070724.1
+GCC_RPMREL = 0.20070724.1%{?dist}
 include ../gcc.am
 GCC_OPTS += --languages=c,cxx
diff --git a/contrib/crossrpms/freebsd5.2/i586/Makefile.am b/contrib/crossrpms/freebsd5.2/i586/Makefile.am
index 2af4c5d1ab..b2803612aa 100644
--- a/contrib/crossrpms/freebsd5.2/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/i586/Makefile.am
@@ -36,6 +36,6 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@
+GCC_RPMREL = @VERSION@%{?dist}
 include ../gcc.am
 GCC_OPTS += --languages=c,cxx,f95
diff --git a/contrib/crossrpms/freebsd6.0/i586/Makefile.am b/contrib/crossrpms/freebsd6.0/i586/Makefile.am
index b3645983ae..cc0bccd398 100644
--- a/contrib/crossrpms/freebsd6.0/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/i586/Makefile.am
@@ -36,6 +36,6 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@
+GCC_RPMREL = @VERSION@%{?dist}
 include ../gcc.am
 GCC_OPTS += --languages=c,cxx,f95,objc
diff --git a/contrib/crossrpms/freebsd6.1/i586/Makefile.am b/contrib/crossrpms/freebsd6.1/i586/Makefile.am
index 65726989ab..f93d3372be 100644
--- a/contrib/crossrpms/freebsd6.1/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.1/i586/Makefile.am
@@ -37,6 +37,6 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@
+GCC_RPMREL = @VERSION@%{?dist}
 include ../gcc.am
 GCC_OPTS += --languages=c,cxx,f95,objc
diff --git a/contrib/crossrpms/freebsd6.2/i586/Makefile.am b/contrib/crossrpms/freebsd6.2/i586/Makefile.am
index 75d97f2c8d..d3d5382292 100644
--- a/contrib/crossrpms/freebsd6.2/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.2/i586/Makefile.am
@@ -37,6 +37,6 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@
+GCC_RPMREL = @VERSION@%{?dist}
 include ../gcc.am
 GCC_OPTS += --languages=c,cxx,f95,objc
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
index 4bc3044b68..c29f28ce3d 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -13,7 +13,7 @@ Summary:      	@tool_target@ gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	@GCC_RPMREL@%{?dist}
+Release:      	@GCC_RPMREL@
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/contrib/crossrpms/mingw32/i686/Makefile.am b/contrib/crossrpms/mingw32/i686/Makefile.am
index 56713880d3..230777b9bf 100644
--- a/contrib/crossrpms/mingw32/i686/Makefile.am
+++ b/contrib/crossrpms/mingw32/i686/Makefile.am
@@ -61,6 +61,6 @@ BINUTILS_OPTS += --disable-infos
 
 GCC_VERS = 4.1.0
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@
+GCC_RPMREL = @VERSION@%{?dist}
 include ../gcc.am
 GCC_OPTS += --languages=c
diff --git a/contrib/crossrpms/rtems4.8/arm/Makefile.am b/contrib/crossrpms/rtems4.8/arm/Makefile.am
index 07243b2591..cf0a7820c6 100644
--- a/contrib/crossrpms/rtems4.8/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/arm/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13
+GCC_RPMREL = 13%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/avr/Makefile.am b/contrib/crossrpms/rtems4.8/avr/Makefile.am
index 1105ce24bc..d7d4791c0c 100644
--- a/contrib/crossrpms/rtems4.8/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/avr/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.0.3
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 12
+GCC_RPMREL = 12%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --disable-infos
diff --git a/contrib/crossrpms/rtems4.8/bfin/Makefile.am b/contrib/crossrpms/rtems4.8/bfin/Makefile.am
index 6ce0c56d27..e768f468ee 100644
--- a/contrib/crossrpms/rtems4.8/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/bfin/Makefile.am
@@ -14,7 +14,7 @@ BINUTILS_OPTS += --disable-infos
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 20
+GCC_RPMREL = 20%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 
diff --git a/contrib/crossrpms/rtems4.8/h8300/Makefile.am b/contrib/crossrpms/rtems4.8/h8300/Makefile.am
index ed1cb456b6..de9bed4926 100644
--- a/contrib/crossrpms/rtems4.8/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/h8300/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13
+GCC_RPMREL = 13%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/i386/Makefile.am b/contrib/crossrpms/rtems4.8/i386/Makefile.am
index a4db00d543..97b6483514 100644
--- a/contrib/crossrpms/rtems4.8/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/i386/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13
+GCC_RPMREL = 13%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/m68k/Makefile.am b/contrib/crossrpms/rtems4.8/m68k/Makefile.am
index b7f5acddf4..eb3ba8cd81 100644
--- a/contrib/crossrpms/rtems4.8/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/m68k/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.2.1
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 20
+GCC_RPMREL = 20%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/mips/Makefile.am b/contrib/crossrpms/rtems4.8/mips/Makefile.am
index c77bbb7cc1..1d585a56d2 100644
--- a/contrib/crossrpms/rtems4.8/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/mips/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13
+GCC_RPMREL = 13%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
index 1107f49c3f..3669a7fafd 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13
+GCC_RPMREL = 13%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/sh/Makefile.am b/contrib/crossrpms/rtems4.8/sh/Makefile.am
index ce7cb75aed..c922599df6 100644
--- a/contrib/crossrpms/rtems4.8/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/sh/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 13
+GCC_RPMREL = 13%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/sparc/Makefile.am b/contrib/crossrpms/rtems4.8/sparc/Makefile.am
index bd81afb676..9fdf02d277 100644
--- a/contrib/crossrpms/rtems4.8/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/sparc/Makefile.am
@@ -14,7 +14,7 @@ BINUTILS_OPTS += --disable-infos
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 14
+GCC_RPMREL = 14%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
diff --git a/contrib/crossrpms/rtems4.8/tic4x/Makefile.am b/contrib/crossrpms/rtems4.8/tic4x/Makefile.am
index 68df6c9dbc..d184593d3b 100644
--- a/contrib/crossrpms/rtems4.8/tic4x/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/tic4x/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 3.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 12
+GCC_RPMREL = 12%{?dist}
 NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS +=
diff --git a/contrib/crossrpms/solaris2.7/sparc/Makefile.am b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
index 7757be40ae..bd9ea15762 100644
--- a/contrib/crossrpms/solaris2.7/sparc/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
@@ -37,6 +37,6 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.1.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = @VERSION@
+GCC_RPMREL = @VERSION@%{?dist}
 include ../gcc.am
 GCC_OPTS += --languages=c,cxx,f95,objc