From 8d182cacc3f79c02ac24e9d9526c8684f6612885 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 26 Feb 2007 09:35:04 +0000 Subject: Add BINUTILS_PKGVERS. --- contrib/crossrpms/binutils/binutils.add | 4 ++-- contrib/crossrpms/binutils/build.add | 2 +- contrib/crossrpms/binutils/prep.add | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add index 1673757f1d..01b86d2e7c 100644 --- a/contrib/crossrpms/binutils/binutils.add +++ b/contrib/crossrpms/binutils/binutils.add @@ -1,5 +1,6 @@ +%define binutils_pkgvers @BINUTILS_PKGVERS@ %define binutils_version @BINUTILS_VERS@ -%define binutils_rpmvers %{expand:%(echo @BINUTILS_VERS@ | tr - _)} +%define binutils_rpmvers %{expand:%(echo "@BINUTILS_VERS@" | tr - _ )} Name: @rpmprefix@@tool_target@-binutils Summary: Binutils for target @tool_target@ @@ -19,7 +20,6 @@ BuildRequires: flex BuildRequires: bison %if %build_infos -# Requires: @rpmprefix@rtems4.7-base-binutils Requires: @rpmprefix@binutils-common %endif diff --git a/contrib/crossrpms/binutils/build.add b/contrib/crossrpms/binutils/build.add index 4c22c6a44a..60e3ae929c 100644 --- a/contrib/crossrpms/binutils/build.add +++ b/contrib/crossrpms/binutils/build.add @@ -2,7 +2,7 @@ mkdir -p build cd build CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_version}/configure \ + ../binutils-%{binutils_pkgvers}/configure \ --build=%_build --host=%_host \ --target=@tool_target@ \ --verbose --disable-nls \ diff --git a/contrib/crossrpms/binutils/prep.add b/contrib/crossrpms/binutils/prep.add index 23a76a8b57..3f2f71910f 100644 --- a/contrib/crossrpms/binutils/prep.add +++ b/contrib/crossrpms/binutils/prep.add @@ -2,7 +2,7 @@ %setup -q -c -T -n %{name}-%{version} %setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_version} +cd binutils-%{binutils_pkgvers} %{?PATCH0:%patch0 -p1} cd .. -- cgit v1.2.3