From f26d9efbd06313d12bd442ddaad5616e9312272d72ccaae1caa0a5e08d976eed Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Mon, 10 Apr 2017 09:27:48 +0000
Subject: [PATCH] Accepting request 487001 from home:marxin:gcc7-to-merge

New SR with removed removal of SLE11 support.

OBS-URL: https://build.opensuse.org/request/show/487001
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=41
---
 cross-aarch64-gcc7.changes            |  7 +++++
 cross-aarch64-gcc7.spec               | 39 ++++++++++++++++++++++++++-
 cross-arm-gcc7.changes                |  7 +++++
 cross-arm-gcc7.spec                   | 39 ++++++++++++++++++++++++++-
 cross-avr-gcc7.changes                |  7 +++++
 cross-avr-gcc7.spec                   | 39 ++++++++++++++++++++++++++-
 cross-epiphany-gcc7-bootstrap.changes |  7 +++++
 cross-epiphany-gcc7-bootstrap.spec    | 39 ++++++++++++++++++++++++++-
 cross-epiphany-gcc7.changes           |  7 +++++
 cross-epiphany-gcc7.spec              | 39 ++++++++++++++++++++++++++-
 cross-hppa-gcc7.changes               |  7 +++++
 cross-hppa-gcc7.spec                  | 39 ++++++++++++++++++++++++++-
 cross-i386-gcc7.changes               |  7 +++++
 cross-i386-gcc7.spec                  | 39 ++++++++++++++++++++++++++-
 cross-m68k-gcc7.changes               |  7 +++++
 cross-m68k-gcc7.spec                  | 39 ++++++++++++++++++++++++++-
 cross-mips-gcc7.changes               |  7 +++++
 cross-mips-gcc7.spec                  | 39 ++++++++++++++++++++++++++-
 cross-nvptx-gcc7.changes              |  7 +++++
 cross-nvptx-gcc7.spec                 | 39 ++++++++++++++++++++++++++-
 cross-ppc64-gcc7.changes              |  7 +++++
 cross-ppc64-gcc7.spec                 | 39 ++++++++++++++++++++++++++-
 cross-ppc64le-gcc7.changes            |  7 +++++
 cross-ppc64le-gcc7.spec               | 39 ++++++++++++++++++++++++++-
 cross-rx-gcc7-bootstrap.changes       |  7 +++++
 cross-rx-gcc7-bootstrap.spec          | 39 ++++++++++++++++++++++++++-
 cross-rx-gcc7.changes                 |  7 +++++
 cross-rx-gcc7.spec                    | 39 ++++++++++++++++++++++++++-
 cross-s390x-gcc7.changes              |  7 +++++
 cross-s390x-gcc7.spec                 | 39 ++++++++++++++++++++++++++-
 cross-sparc-gcc7.changes              |  7 +++++
 cross-sparc-gcc7.spec                 | 39 ++++++++++++++++++++++++++-
 cross-sparc64-gcc7.changes            |  7 +++++
 cross-sparc64-gcc7.spec               | 39 ++++++++++++++++++++++++++-
 cross-x86_64-gcc7.changes             |  7 +++++
 cross-x86_64-gcc7.spec                | 39 ++++++++++++++++++++++++++-
 cross.spec.in                         | 38 +++++++++++++++++++++++++-
 gcc.spec.in                           |  3 +--
 gcc7-testresults.changes              |  7 +++++
 gcc7-testresults.spec                 |  3 ++-
 gcc7.changes                          |  7 +++++
 gcc7.spec                             |  3 ++-
 42 files changed, 866 insertions(+), 23 deletions(-)

diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-aarch64-gcc7.changes
+++ b/cross-aarch64-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec
index 055a680..18ddb5d 100644
--- a/cross-aarch64-gcc7.spec
+++ b/cross-aarch64-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-arm-gcc7.changes
+++ b/cross-arm-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec
index 1ac0557..60075cb 100644
--- a/cross-arm-gcc7.spec
+++ b/cross-arm-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-avr-gcc7.changes
+++ b/cross-avr-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec
index 2845afd..68a5da3 100644
--- a/cross-avr-gcc7.spec
+++ b/cross-avr-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes
index c221eb4..3c475fa 100644
--- a/cross-epiphany-gcc7-bootstrap.changes
+++ b/cross-epiphany-gcc7-bootstrap.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec
index c9b00f6..4f5849e 100644
--- a/cross-epiphany-gcc7-bootstrap.spec
+++ b/cross-epiphany-gcc7-bootstrap.spec
@@ -30,6 +30,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -97,6 +99,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -147,6 +150,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -641,6 +647,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -649,7 +677,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-epiphany-gcc7.changes
+++ b/cross-epiphany-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec
index 0b373ab..11b996a 100644
--- a/cross-epiphany-gcc7.spec
+++ b/cross-epiphany-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-hppa-gcc7.changes
+++ b/cross-hppa-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec
index 1bc0c56..fdb85e7 100644
--- a/cross-hppa-gcc7.spec
+++ b/cross-hppa-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-i386-gcc7.changes
+++ b/cross-i386-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec
index c6769fa..ab39262 100644
--- a/cross-i386-gcc7.spec
+++ b/cross-i386-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-m68k-gcc7.changes
+++ b/cross-m68k-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec
index 220ddc3..3df2a3c 100644
--- a/cross-m68k-gcc7.spec
+++ b/cross-m68k-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-mips-gcc7.changes
+++ b/cross-mips-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec
index f4db426..06fb322 100644
--- a/cross-mips-gcc7.spec
+++ b/cross-mips-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-nvptx-gcc7.changes
+++ b/cross-nvptx-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec
index 96e5e32..9ce71d2 100644
--- a/cross-nvptx-gcc7.spec
+++ b/cross-nvptx-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-ppc64-gcc7.changes
+++ b/cross-ppc64-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec
index 9cde299..27b3335 100644
--- a/cross-ppc64-gcc7.spec
+++ b/cross-ppc64-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-ppc64le-gcc7.changes
+++ b/cross-ppc64le-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec
index 5233775..e80d823 100644
--- a/cross-ppc64le-gcc7.spec
+++ b/cross-ppc64le-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes
index c221eb4..3c475fa 100644
--- a/cross-rx-gcc7-bootstrap.changes
+++ b/cross-rx-gcc7-bootstrap.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec
index 23dfeb1..b5ddfa5 100644
--- a/cross-rx-gcc7-bootstrap.spec
+++ b/cross-rx-gcc7-bootstrap.spec
@@ -30,6 +30,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -97,6 +99,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -147,6 +150,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -641,6 +647,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -649,7 +677,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-rx-gcc7.changes
+++ b/cross-rx-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec
index 9cbe047..d299397 100644
--- a/cross-rx-gcc7.spec
+++ b/cross-rx-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-s390x-gcc7.changes
+++ b/cross-s390x-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec
index e65081e..40f832a 100644
--- a/cross-s390x-gcc7.spec
+++ b/cross-s390x-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-sparc-gcc7.changes
+++ b/cross-sparc-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec
index 3c37528..476b2e7 100644
--- a/cross-sparc-gcc7.spec
+++ b/cross-sparc-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-sparc64-gcc7.changes
+++ b/cross-sparc64-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec
index 270ac7b..1713faf 100644
--- a/cross-sparc64-gcc7.spec
+++ b/cross-sparc64-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes
index c221eb4..3c475fa 100644
--- a/cross-x86_64-gcc7.changes
+++ b/cross-x86_64-gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec
index 5ad4686..0667380 100644
--- a/cross-x86_64-gcc7.spec
+++ b/cross-x86_64-gcc7.spec
@@ -29,6 +29,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -96,6 +98,7 @@
 Name:           %{pkgname}
 %if %{cross_arch} != "nvptx"
 BuildRequires:  cross-%{binutils_target}-binutils
+Requires:       cross-%{binutils_target}-binutils
 %endif
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,6 +149,9 @@ Obsoletes:      cross-ppc-gcc49 <= 4.9.0+r209354
 Provides:       %{gcc_target_arch}-gcc
 Conflicts:      %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
@@ -640,6 +646,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -648,7 +676,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/cross.spec.in b/cross.spec.in
index 97d8e28..55f4487 100644
--- a/cross.spec.in
+++ b/cross.spec.in
@@ -8,6 +8,8 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
+# nospeccleaner
+
 %define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
@@ -126,6 +128,9 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354
 Provides: %{gcc_target_arch}-gcc
 Conflicts: %selfconflict %{gcc_target_arch}-gcc
 %endif
+BuildRequires:  update-alternatives
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 # COMMON-BEGIN
 # COMMON-END
@@ -235,6 +240,28 @@ rpm -q --changelog binutils >  usr/share/icecream-envs/%{name}_%{_arch}.binutils
 rm -r env
 %endif
 
+%post
+%if 0%{?gcc_accel}
+%{_sbindir}/update-alternatives \
+  --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} @base_ver@ \
+  --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ar %{gcc_target_arch}-gcc-ar %{_bindir}/%{gcc_target_arch}-gcc-ar%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-nm %{gcc_target_arch}-gcc-nm %{_bindir}/%{gcc_target_arch}-gcc-nm%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcc-ranlib %{gcc_target_arch}-gcc-ranlib %{_bindir}/%{gcc_target_arch}-gcc-ranlib%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov %{gcc_target_arch}-gcov %{_bindir}/%{gcc_target_arch}-gcov%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-dump %{gcc_target_arch}-gcov-dump %{_bindir}/%{gcc_target_arch}-gcov-dump%{binsuffix} \
+  --slave %{_bindir}/%{gcc_target_arch}-gcov-tool %{gcc_target_arch}-gcov-tool %{_bindir}/%{gcc_target_arch}-gcov-tool%{binsuffix}
+%endif
+
+%postun
+%if 0%{?gcc_accel}
+if [ ! -f %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} ] ; then
+%{_sbindir}/update-alternatives --remove %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix}
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %if 0%{?gcc_accel:1}
@@ -243,7 +270,16 @@ rm -r env
 %dir %{libsubdir}/accel
 %{libsubdir}/accel/%{gcc_target_arch}
 %else
-%{_prefix}/bin/%{gcc_target_arch}-*
+%{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ar%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-nm%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcc-ranlib%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-dump%{binsuffix}
+%{_prefix}/bin/%{gcc_target_arch}-gcov-tool%{binsuffix}
 %endif
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
diff --git a/gcc.spec.in b/gcc.spec.in
index f6b4d33..fc9b9ad 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -15,8 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-# icecream 0
+# nospeccleaner
 
 
 # Ada currently fails to build on a few platforms, enable it only
diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes
index c221eb4..3c475fa 100644
--- a/gcc7-testresults.changes
+++ b/gcc7-testresults.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec
index 4690cc0..12fe796 100644
--- a/gcc7-testresults.spec
+++ b/gcc7-testresults.spec
@@ -14,7 +14,6 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 %define building_testsuite 1
@@ -35,6 +34,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# nospeccleaner
+
 # Ada currently fails to build on a few platforms, enable it only
 # on those that work
 %if %{suse_version} >= 1310
diff --git a/gcc7.changes b/gcc7.changes
index c221eb4..3c475fa 100644
--- a/gcc7.changes
+++ b/gcc7.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  4 14:44:52 UTC 2017 - mliska@suse.cz
+
+- Add update-alternatives for binaries produces by cross compilers.
+- Add nospeccleaner comment, remove legacy norootforbuild and
+  icecream.
+
 -------------------------------------------------------------------
 Fri Mar 31 08:51:09 UTC 2017 - rguenther@suse.com
 
diff --git a/gcc7.spec b/gcc7.spec
index 9e4d97a..31babf2 100644
--- a/gcc7.spec
+++ b/gcc7.spec
@@ -14,9 +14,10 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
+# nospeccleaner
+
 # Ada currently fails to build on a few platforms, enable it only
 # on those that work
 %if %{suse_version} >= 1310