Move %{?dist} into GCC_RPMREL.

This commit is contained in:
Ralf Corsepius
2007-07-24 14:24:43 +00:00
parent c5721b9ad5
commit b8a8bfb0dc
19 changed files with 19 additions and 19 deletions

View File

@@ -111,6 +111,6 @@ BINUTILS_OPTS += --disable-infos
GCC_VERS = 3.4.4 GCC_VERS = 3.4.4
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 0.20070724.1 GCC_RPMREL = 0.20070724.1%{?dist}
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=c,cxx GCC_OPTS += --languages=c,cxx

View File

@@ -36,6 +36,6 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@ GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=c,cxx,f95 GCC_OPTS += --languages=c,cxx,f95

View File

@@ -36,6 +36,6 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@ GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=c,cxx,f95,objc GCC_OPTS += --languages=c,cxx,f95,objc

View File

@@ -37,6 +37,6 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@ GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=c,cxx,f95,objc GCC_OPTS += --languages=c,cxx,f95,objc

View File

@@ -37,6 +37,6 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@ GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=c,cxx,f95,objc GCC_OPTS += --languages=c,cxx,f95,objc

View File

@@ -13,7 +13,7 @@ Summary: @tool_target@ gcc
Group: Development/Tools Group: Development/Tools
Version: %{gcc_rpmvers} Version: %{gcc_rpmvers}
Release: @GCC_RPMREL@%{?dist} Release: @GCC_RPMREL@
License: GPL License: GPL
URL: http://gcc.gnu.org URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

View File

@@ -61,6 +61,6 @@ BINUTILS_OPTS += --disable-infos
GCC_VERS = 4.1.0 GCC_VERS = 4.1.0
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@ GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=c GCC_OPTS += --languages=c

View File

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 13 GCC_RPMREL = 13%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=cxx GCC_OPTS += --languages=cxx

View File

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
GCC_VERS = 4.0.3 GCC_VERS = 4.0.3
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 12 GCC_RPMREL = 12%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --disable-infos GCC_OPTS += --disable-infos

View File

@@ -14,7 +14,7 @@ BINUTILS_OPTS += --disable-infos
GCC_VERS = 4.2.1 GCC_VERS = 4.2.1
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 20 GCC_RPMREL = 20%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am

View File

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 13 GCC_RPMREL = 13%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=cxx GCC_OPTS += --languages=cxx

View File

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 13 GCC_RPMREL = 13%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=cxx GCC_OPTS += --languages=cxx

View File

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
GCC_VERS = 4.2.1 GCC_VERS = 4.2.1
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 20 GCC_RPMREL = 20%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=cxx GCC_OPTS += --languages=cxx

View File

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 13 GCC_RPMREL = 13%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=cxx GCC_OPTS += --languages=cxx

View File

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 13 GCC_RPMREL = 13%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=cxx GCC_OPTS += --languages=cxx

View File

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 13 GCC_RPMREL = 13%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=cxx GCC_OPTS += --languages=cxx

View File

@@ -14,7 +14,7 @@ BINUTILS_OPTS += --disable-infos
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 14 GCC_RPMREL = 14%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=cxx GCC_OPTS += --languages=cxx

View File

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
GCC_VERS = 3.4.6 GCC_VERS = 3.4.6
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = 12 GCC_RPMREL = 12%{?dist}
NEWLIB_VERS = 1.15.0 NEWLIB_VERS = 1.15.0
include ../gcc.am include ../gcc.am
GCC_OPTS += GCC_OPTS +=

View File

@@ -37,6 +37,6 @@ BINUTILS_OPTS +=
GCC_VERS = 4.1.2 GCC_VERS = 4.1.2
GCC_PKGVERS = $(GCC_VERS) GCC_PKGVERS = $(GCC_VERS)
GCC_RPMREL = @VERSION@ GCC_RPMREL = @VERSION@%{?dist}
include ../gcc.am include ../gcc.am
GCC_OPTS += --languages=c,cxx,f95,objc GCC_OPTS += --languages=c,cxx,f95,objc