diff --git a/binutils.changes b/binutils.changes
index 1920ec1..b928d27 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/binutils.spec b/binutils.spec
index 28a8a60..52770d3 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           binutils
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -428,26 +429,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -457,24 +458,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -485,45 +486,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -583,12 +585,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -618,7 +618,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -631,7 +630,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index 02e003e..fb49451 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-aarch64-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    aarch64
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 209f3e7..c534f9f 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-arm-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    %arm
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index a6dd25e..673e36f 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-avr-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    avr
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index a6f6c3e..ea3453d 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-epiphany-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    epiphany
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 8ced6c5..031f6f6 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-hppa-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    hppa
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index 69322b8..a1d75a8 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-hppa64-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    hppa64
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index c02d032..c8b98b4 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-i386-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    %ix86
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 9239d3c..ed35fa8 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ia64-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    ia64
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index 2499057..9d6d74e 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-m68k-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    m68k
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 06a4c10..152a8b8 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-mips-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    mips
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 40aa818..dec577b 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ppc-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    ppc
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index 5a0e550..efa0a1d 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ppc64-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    ppc64
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index 6f88fd9..5db68c3 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ppc64le-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    ppc64le
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-riscv64-binutils.changes b/cross-riscv64-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-riscv64-binutils.changes
+++ b/cross-riscv64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-riscv64-binutils.spec b/cross-riscv64-binutils.spec
index 9b82465..81c3cc8 100644
--- a/cross-riscv64-binutils.spec
+++ b/cross-riscv64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-riscv64-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    riscv64
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-rx-binutils.changes b/cross-rx-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-rx-binutils.changes
+++ b/cross-rx-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec
index 82afb7a..b4b0daa 100644
--- a/cross-rx-binutils.spec
+++ b/cross-rx-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-rx-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    rx
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 36fa66e..78873a3 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-s390-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    s390
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 01fb8e0..4f62fdd 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-s390x-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    s390x
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 58fb87b..bf44d01 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-sparc-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    sparc
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index 0408e94..7c94668 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-sparc64-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    sparc64
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 8794ca3..53b1095 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-spu-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    spu
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 65c4cb2..e2c3a27 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-x86_64-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    x86_64
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so
diff --git a/cross-xtensa-binutils.changes b/cross-xtensa-binutils.changes
index 1920ec1..b928d27 100644
--- a/cross-xtensa-binutils.changes
+++ b/cross-xtensa-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 27 20:36:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- use fdupes on datadir
+- remove RPM_BUILD_ROOT usage and other cleanups 
+
 -------------------------------------------------------------------
 Fri Nov 12 13:20:09 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/cross-xtensa-binutils.spec b/cross-xtensa-binutils.spec
index 4460bf8..3f6d534 100644
--- a/cross-xtensa-binutils.spec
+++ b/cross-xtensa-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-xtensa-binutils
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@ ExcludeArch:    xtensa
 BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 # for the testsuite
@@ -431,26 +432,26 @@ cd build-dir
 %if 0%{!?cross:1}
 # installing native binutils
 %ifarch %gold_archs
-make DESTDIR=$RPM_BUILD_ROOT install-gold
-ln -sf ld.gold $RPM_BUILD_ROOT%{_bindir}/gold
+make DESTDIR=%{buildroot} install-gold
+ln -sf ld.gold %{buildroot}%{_bindir}/gold
 %endif
-make DESTDIR=$RPM_BUILD_ROOT install-info install
-make -C gas/doc DESTDIR=$RPM_BUILD_ROOT install-info-am install-am
-make DESTDIR=$RPM_BUILD_ROOT install-bfd install-opcodes
-if [ ! -f "%buildroot/%_bindir/ld.bfd" ]; then
-  mv "%buildroot/%_bindir"/{ld,ld.bfd};
+make DESTDIR=%{buildroot} install-info install
+make -C gas/doc DESTDIR=%{buildroot} install-info-am install-am
+make DESTDIR=%{buildroot} install-bfd install-opcodes
+if [ ! -f "%{buildroot}/%_bindir/ld.bfd" ]; then
+  mv "%{buildroot}/%_bindir"/{ld,ld.bfd};
 else
-  rm -f "%buildroot/%_bindir/ld";
+  rm -f "%{buildroot}/%_bindir/ld";
 fi
 %if ! 0%{with libalternatives}
-mkdir -p "%buildroot/%_sysconfdir/alternatives";
+mkdir -p "%{buildroot}/%_sysconfdir/alternatives";
 # Keep older versions of brp-symlink happy
 %if %{suse_version} < 1310
-ln -s "%_bindir/ld" "%buildroot/%_sysconfdir/alternatives/ld"
+ln -s "%_bindir/ld" "%{buildroot}/%_sysconfdir/alternatives/ld"
 %endif
-ln -s "%_sysconfdir/alternatives/ld" "%buildroot/%_bindir/ld";
+ln -s "%_sysconfdir/alternatives/ld" "%{buildroot}/%_bindir/ld";
 %else
-ln -s %{_bindir}/alts "%buildroot/%_bindir/ld";
+ln -s %{_bindir}/alts "%{buildroot}/%_bindir/ld";
 mkdir -p %{buildroot}%{_datadir}/libalternatives/ld;
 cat > %{buildroot}%{_datadir}/libalternatives/ld/1.conf <<EOF
 binary=%{_bindir}/ld.gold
@@ -460,24 +461,24 @@ binary=%{_bindir}/ld.bfd
 EOF
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin
-mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts
+rm -rf %{buildroot}%{_prefix}/%{HOST}/bin
+mkdir -p %{buildroot}%{_prefix}/%{HOST}/bin
+ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} %{buildroot}%{_prefix}/%{HOST}/bin
+mv %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir}
+ln -sf ../../%{_lib}/ldscripts %{buildroot}%{_prefix}/%{HOST}/lib/ldscripts
 # Install header files
-make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT
+make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=%{buildroot}
 # We want the PIC libiberty.a
-install -m 644 libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libiberty/pic/libiberty.a %{buildroot}%{_libdir}
 #
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libbfd-*
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libopcodes-*
+chmod a+x %{buildroot}%{_libdir}/libbfd-*
+chmod a+x %{buildroot}%{_libdir}/libopcodes-*
 # No shared linking outside binutils
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.so
-rm $RPM_BUILD_ROOT%{_libdir}/lib{bfd,opcodes}.la
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
+rm %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
 # Remove unwanted files to shut up rpm
-rm -f $RPM_BUILD_ROOT%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
+rm -f %{buildroot}%{_infodir}/configure* $RPM_BUILD_ROOT%{_infodir}/standards.info*
+rm -f %{buildroot}%{_mandir}/man1/dlltool.1 $RPM_BUILD_ROOT%{_mandir}/man1/windres.1 $RPM_BUILD_ROOT%{_mandir}/man1/windmc.1
 cd ..
 %find_lang binutils
 %find_lang bfd binutils.lang
@@ -488,45 +489,46 @@ cd ..
 %ifarch %gold_archs
 %find_lang gold binutils-gold.lang
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -m 644 binutils/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-binutils
-install -m 644 gas/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-gas
-install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 644 binutils/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-binutils
+install -m 644 gas/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-gas
+install -m 644 ld/NEWS %{buildroot}%{_docdir}/%{name}/NEWS-ld
 %else
 # installing cross-TARGET-binutils and TARGET-binutils
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET_OS})
-for f in %buildroot/usr/$T/bin/* ; do
+T=$(basename %{buildroot}/usr/%{TARGET_OS})
+for f in %{buildroot}/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "arm"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in arm-none-eabi; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "riscv64"
 # Instead of building duplicate binutils, add symlinks
-for f in %buildroot/usr/$T/bin/* ; do
+for f in %{buildroot}/usr/$T/bin/* ; do
   for p in riscv64-elf; do
-    ln -sf %{_bindir}/$T-$(basename $f) %buildroot%{_bindir}/$p-$(basename $f)
+    ln -sf %{_bindir}/$T-$(basename $f) %{buildroot}%{_bindir}/$p-$(basename $f)
   done
 done
 %endif
 %if "%{TARGET}" == "avr"
-install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
-ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
+install -c gas-nesc/as-new %{buildroot}%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as %{buildroot}%{_prefix}/%{TARGET_OS}/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}/include
-rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_prefix}/lib*
+rm -rf %{buildroot}%{_prefix}/include
+rm -f %{buildroot}%{_prefix}/bin/*-c++filt
 > ../binutils.lang
 %endif
+%fdupes %{buildroot}%{_prefix}
 
 %if 0%{!?cross:1}
 %post
@@ -586,12 +588,10 @@ fi;
 %postun -n libctf0 -p /sbin/ldconfig
 %postun -n libctf-nobfd0 -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 %endif
 
 %files -f binutils.lang
-%defattr(-,root,root)
 %if 0%{!?cross:1}
 %{_docdir}/%{name}
 %{_prefix}/%{HOST}/bin/*
@@ -621,7 +621,6 @@ fi;
 
 %ifarch %gold_archs
 %files gold -f binutils-gold.lang
-%defattr(-,root,root)
 %doc gold/NEWS gold/README
 %{_bindir}/gold
 %{_bindir}/ld.gold
@@ -634,7 +633,6 @@ fi;
 
 %if 0%{!?cross:1}
 %files devel
-%defattr(-,root,root)
 %{_prefix}/include/*.h
 %{_libdir}/lib*.*a
 %{_libdir}/libctf.so