From c8956fd7e9418e2f7978975bda4e8c532e43005d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 22 Feb 2006 11:54:10 +0000 Subject: Use gcc_version instead of %version, to work around rpm screwing up on %version in mixed-versioned packages. --- contrib/crossrpms/gcc/rpm-install.add | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'contrib/crossrpms/gcc') diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add index ec749c352b..0dc5461c10 100644 --- a/contrib/crossrpms/gcc/rpm-install.add +++ b/contrib/crossrpms/gcc/rpm-install.add @@ -31,19 +31,19 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ %define __os_install_post . ./os_install_post -cat << EOF > %{_builddir}/%{name}-%{version}/find-provides +cat << EOF > %{_builddir}/%{name}-%{gcc_version}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/(lib|include|sys-root)' \ | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_provides EOF -chmod +x %{_builddir}/%{name}-%{version}/find-provides -%define __find_provides %{_builddir}/%{name}-%{version}/find-provides +chmod +x %{_builddir}/%{name}-%{gcc_version}/find-provides +%define __find_provides %{_builddir}/%{name}-%{gcc_version}/find-provides -cat << EOF > %{_builddir}/%{name}-%{version}/find-requires +cat << EOF > %{_builddir}/%{name}-%{gcc_version}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/(lib|include|sys-root)' \ | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_requires EOF -chmod +x %{_builddir}/%{name}-%{version}/find-requires -%define __find_requires %{_builddir}/%{name}-%{version}/find-requires +chmod +x %{_builddir}/%{name}-%{gcc_version}/find-requires +%define __find_requires %{_builddir}/%{name}-%{gcc_version}/find-requires -- cgit v1.2.3