diff --git a/binutils.changes b/binutils.changes
index b20a5ec..f1a91b6 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/binutils.spec b/binutils.spec
index 4ce146d..c3999b7 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -163,7 +162,7 @@ AutoReqProv:    on
 Requires:       binutils = %{version}-%{release}
 Group:          Development/Tools/Building
 %if 0%{suse_version} > 1100
-%define gold_archs %ix86 x86_64 ppc ppc64 %sparc
+%define gold_archs %ix86 x86_64 ppc ppc64 sparc sparc64
 %endif
 
 %description gold
@@ -273,7 +272,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -418,7 +417,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -491,9 +490,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-alpha-binutils.changes b/cross-alpha-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-alpha-binutils.changes
+++ b/cross-alpha-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec
index ddfe9b4..963d60b 100644
--- a/cross-alpha-binutils.spec
+++ b/cross-alpha-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-alpha-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-alpha-binutils
+Name:           cross-alpha-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 0dc8a65..64210cb 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-arm-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-arm-binutils
+Name:           cross-arm-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index 1a461f2..9a5a882 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-avr-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-avr-binutils
+Name:           cross-avr-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index a3617bf..2737021 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-hppa-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-hppa-binutils
+Name:           cross-hppa-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index cb0db7d..a71aeed 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-hppa64-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-hppa64-binutils
+Name:           cross-hppa64-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 93a8c2a..790d41c 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-i386-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-i386-binutils
+Name:           cross-i386-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index b0dd164..7c1726c 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-ia64-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-ia64-binutils
+Name:           cross-ia64-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index c212937..31cd099 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-mips-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-mips-binutils
+Name:           cross-mips-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 628a4a1..eb50d09 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-ppc-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-ppc-binutils
+Name:           cross-ppc-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index 1cb353d..7bb9c36 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-ppc64-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-ppc64-binutils
+Name:           cross-ppc64-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 14c8011..d46f19e 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-s390-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-s390-binutils
+Name:           cross-s390-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 05b5647..dfb43c3 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-s390x-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-s390x-binutils
+Name:           cross-s390x-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-sh4-binutils.changes b/cross-sh4-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-sh4-binutils.changes
+++ b/cross-sh4-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-sh4-binutils.spec b/cross-sh4-binutils.spec
index 21eafa7..e510303 100644
--- a/cross-sh4-binutils.spec
+++ b/cross-sh4-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-sh4-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-sh4-binutils
+Name:           cross-sh4-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index d8babd9..237f79f 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-sparc-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-sparc-binutils
+Name:           cross-sparc-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index b2b6fd0..80f615e 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-spu-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-spu-binutils
+Name:           cross-spu-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index b20a5ec..f1a91b6 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
-
-- Fix removal of unwanted files (man,info,libiberty) on the
-  cross binutils.
-
--------------------------------------------------------------------
-Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
-
-- add baselibs.conf as a source
-
--------------------------------------------------------------------
-Mon Dec  7 16:14:27 CET 2009 - jengelh@medozas.de
-
-- SPARC build support for binutils
-
 -------------------------------------------------------------------
 Wed Nov  4 15:44:30 CET 2009 - matz@suse.de
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 1142bd5..3254ed6 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package binutils (Version 2.20.0)
+# spec file for package cross-x86_64-binutils (Version 2.20.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,7 @@
 
 
 
-Name:         cross-x86_64-binutils
+Name:           cross-x86_64-binutils
 BuildRequires:  bison dejagnu flex gcc-c++
 %if 0%{suse_version} > 1110
 BuildRequires:  zlib-devel-static
@@ -35,7 +35,7 @@ Release:        1
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha armv4l hppa mips sh4 sparc sparc64
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -70,7 +70,6 @@ Summary:        GNU Binutils
 Source:         binutils-%{binutils_version}.tar.bz2
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SuSE.packagers
-Source3:	baselibs.conf
 Patch2:         s390-pic.patch
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
@@ -245,7 +244,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64.*/sparc/" -e "s/sparcv.*/sparc/")-suse-linux
+%define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 
 %prep
@@ -379,7 +378,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
+  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +443,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_prefix}/info
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang