Move %{?dist} into GCC_RPMREL.

2007-07-24 14:24:43 +00:00
parent c5721b9ad5
commit b8a8bfb0dc
19 changed files with 19 additions and 19 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 +=
--- 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