Move %{?dist} into BINUTILS_RPMREL.

19 files changed, 19 insertions, 19 deletions

diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add
index aeb9cbfd49..30177471b7 100644
--- a/contrib/crossrpms/binutils/binutils.add
+++ b/contrib/crossrpms/binutils/binutils.add
@@ -6,7 +6,7 @@ Name:		@rpmprefix@@tool_target@-binutils
 Summary:	Binutils for target @tool_target@
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	@BINUTILS_RPMREL@%{?dist}
+Release:	@BINUTILS_RPMREL@
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/contrib/crossrpms/cygwin/i686/Makefile.am b/contrib/crossrpms/cygwin/i686/Makefile.am
index 8e68251777..07b23dc1e4 100644
--- a/contrib/crossrpms/cygwin/i686/Makefile.am
+++ b/contrib/crossrpms/cygwin/i686/Makefile.am
@@ -105,7 +105,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-zlib.spec
 # Check bfd/configure for the real version number
 BINUTILS_VERS = 2.17.50
 BINUTILS_PKGVERS = 20060817-1
-BINUTILS_RPMREL = 0.20070724.1
+BINUTILS_RPMREL = 0.20070724.1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS += --disable-infos
 
diff --git a/contrib/crossrpms/freebsd5.2/i586/Makefile.am b/contrib/crossrpms/freebsd5.2/i586/Makefile.am
index b2803612aa..ab35b9df9c 100644
--- a/contrib/crossrpms/freebsd5.2/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/i586/Makefile.am
@@ -30,7 +30,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = @VERSION@
+BINUTILS_RPMREL = @VERSION@%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/freebsd6.0/i586/Makefile.am b/contrib/crossrpms/freebsd6.0/i586/Makefile.am
index cc0bccd398..7424197536 100644
--- a/contrib/crossrpms/freebsd6.0/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/i586/Makefile.am
@@ -30,7 +30,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = @VERSION@
+BINUTILS_RPMREL = @VERSION@%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/freebsd6.1/i586/Makefile.am b/contrib/crossrpms/freebsd6.1/i586/Makefile.am
index f93d3372be..db413dfbf9 100644
--- a/contrib/crossrpms/freebsd6.1/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.1/i586/Makefile.am
@@ -31,7 +31,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = @VERSION@
+BINUTILS_RPMREL = @VERSION@%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/freebsd6.2/i586/Makefile.am b/contrib/crossrpms/freebsd6.2/i586/Makefile.am
index d3d5382292..643de67d9a 100644
--- a/contrib/crossrpms/freebsd6.2/i586/Makefile.am
+++ b/contrib/crossrpms/freebsd6.2/i586/Makefile.am
@@ -31,7 +31,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = @VERSION@
+BINUTILS_RPMREL = @VERSION@%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/mingw32/i686/Makefile.am b/contrib/crossrpms/mingw32/i686/Makefile.am
index 230777b9bf..7b7caffd08 100644
--- a/contrib/crossrpms/mingw32/i686/Makefile.am
+++ b/contrib/crossrpms/mingw32/i686/Makefile.am
@@ -55,7 +55,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-w32api.spec
 
 BINUTILS_VERS = 2.16.91-20060119-1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS += --disable-infos
 
diff --git a/contrib/crossrpms/rtems4.8/arm/Makefile.am b/contrib/crossrpms/rtems4.8/arm/Makefile.am
index cf0a7820c6..80f3f795d5 100644
--- a/contrib/crossrpms/rtems4.8/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/arm/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/avr/Makefile.am b/contrib/crossrpms/rtems4.8/avr/Makefile.am
index d7d4791c0c..2fe5c9cddb 100644
--- a/contrib/crossrpms/rtems4.8/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/avr/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/bfin/Makefile.am b/contrib/crossrpms/rtems4.8/bfin/Makefile.am
index e768f468ee..8cc54d38f9 100644
--- a/contrib/crossrpms/rtems4.8/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/bfin/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17.50
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 # We don't want docs from bleeding edge upstream
diff --git a/contrib/crossrpms/rtems4.8/h8300/Makefile.am b/contrib/crossrpms/rtems4.8/h8300/Makefile.am
index de9bed4926..9b422f64a8 100644
--- a/contrib/crossrpms/rtems4.8/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/h8300/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/i386/Makefile.am b/contrib/crossrpms/rtems4.8/i386/Makefile.am
index 97b6483514..3cc5573069 100644
--- a/contrib/crossrpms/rtems4.8/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/i386/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/m68k/Makefile.am b/contrib/crossrpms/rtems4.8/m68k/Makefile.am
index eb3ba8cd81..6eb01b6f3f 100644
--- a/contrib/crossrpms/rtems4.8/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/m68k/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/mips/Makefile.am b/contrib/crossrpms/rtems4.8/mips/Makefile.am
index 1d585a56d2..7b748777b9 100644
--- a/contrib/crossrpms/rtems4.8/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/mips/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
index 3669a7fafd..3243240582 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/sh/Makefile.am b/contrib/crossrpms/rtems4.8/sh/Makefile.am
index c922599df6..a9f0718c7e 100644
--- a/contrib/crossrpms/rtems4.8/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/sh/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/sparc/Makefile.am b/contrib/crossrpms/rtems4.8/sparc/Makefile.am
index 9fdf02d277..11fde3f709 100644
--- a/contrib/crossrpms/rtems4.8/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/sparc/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17.50
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 1%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 # We don't want docs from bleeding edge upstream
diff --git a/contrib/crossrpms/rtems4.8/tic4x/Makefile.am b/contrib/crossrpms/rtems4.8/tic4x/Makefile.am
index d184593d3b..d2e49a5019 100644
--- a/contrib/crossrpms/rtems4.8/tic4x/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/tic4x/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 2%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/solaris2.7/sparc/Makefile.am b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
index bd9ea15762..56d1f50b75 100644
--- a/contrib/crossrpms/solaris2.7/sparc/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
@@ -31,7 +31,7 @@ noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
 
 BINUTILS_VERS = 2.17
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = @VERSION@
+BINUTILS_RPMREL = @VERSION@%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=