--#%_source_payload w9.gzdio
--#%_binary_payload w9.gzdio
-+%_source_payload w9.gzdio
-+%_binary_payload w9.lzdio
-
- # Archive formats to use for source/binary package payloads.
- # "cpio" cpio archive (default)
-@@ -498,7 +498,7 @@
-
- #
- # Path to magic file used for file classification.
--%_rpmfc_magic_path %{_rpmhome}/magic
-+%_rpmfc_magic_path /usr/share/file/magic
-
- #==============================================================================
- # ---- Database configuration macros.
-@@ -1127,17 +1127,17 @@
- %_exec_prefix %{_prefix}
- %_bindir %{_exec_prefix}/bin
- %_sbindir %{_exec_prefix}/sbin
--%_libexecdir %{_exec_prefix}/libexec
-+%_libexecdir %{_exec_prefix}/lib
- %_datadir %{_prefix}/share
--%_sysconfdir %{_prefix}/etc
--%_sharedstatedir %{_prefix}/com
--%_localstatedir %{_prefix}/var
-+%_sysconfdir /etc
-+%_sharedstatedir /var/lib
-+%_localstatedir /var
- %_lib lib
- %_libdir %{_exec_prefix}/%{_lib}
- %_includedir %{_prefix}/include
- %_oldincludedir /usr/include
--%_infodir %{_prefix}/info
--%_mandir %{_prefix}/man
-+%_infodir %{_prefix}/share/info
-+%_mandir %{_prefix}/share/man
- %_localedir %{_datadir}/locale
-
- #==============================================================================
-@@ -1428,7 +1428,25 @@
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- #%__executable_provides %{_rpmhome}/executabledeps.sh --provides
- #%__executable_requires %{_rpmhome}/executabledeps.sh --requires
--%__scriptlet_requires /bin/bash --rpm-requires
-+#%__scriptlet_requires /bin/bash --rpm-requires
-
-+# PLD rpm macros
-+%_enable_debug_packages 1
-+
-+#-----------------------------------------------------------------
-+# CFLAGS and LDFLAGS used to build
-+
-+%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
-+# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
-+
-+%debugcflags -O0 -g -Wall
-+%optldflags -Wl,--as-needed
-+
-+# Warning: those macros are overwritten by macros.build,
-+# left here for compatibility
-+%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
-+%rpmcxxflags %{rpmcflags}
-+%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
-+
- # \endverbatim
- #*/
-