---- rpm-4.0.2/macros.in.wiget Mon Dec 11 19:40:56 2000
-+++ rpm-4.0.2/macros.in Fri Aug 10 12:20:45 2001
-@@ -476,17 +476,14 @@
- # Macro(s) similar to the tokens used by configure.
+diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
+--- rpm-4.4.7.org/macros.in 2007-01-06 18:28:22.094067000 +0100
++++ rpm-4.4.7/macros.in 2007-01-06 18:37:05.250762500 +0100
+@@ -217,10 +217,11 @@
+ %_srcrpmdir %{_topdir}/SRPMS
+
+ # Directory where temporaray files can be created.
+-%_tmppath %{_var}/tmp
++%_tmppath %(echo "${TMPDIR:-/tmp}")
++%tmpdir %{_tmppath}
+
+ # Path to top of build area.
+-%_topdir %{_usrsrc}/rpm
++%_topdir %(echo $HOME)/rpm
+
+ # The path to the unzip executable (legacy, use %{__unzip} instead).
+ %_unzipbin %{__unzip}
+@@ -233,7 +234,7 @@
+ # Configurable build root path, same as BuildRoot: in a specfile.
+ # (Note: the configured macro value will override the spec file value).
#
- %_build %{_host}
--%_build_alias %{_host_alias}
- %_build_cpu %{_host_cpu}
- %_build_vendor %{_host_vendor}
- %_build_os %{_host_os}
- %_host @host@
--%_host_alias @host_alias@
- %_host_cpu @host_cpu@
- %_host_vendor @host_vendor@
- %_host_os @host_os@
- %_target %{_host}
--%_target_alias %{_host_alias}
- %_target_cpu %{_host_cpu}
- %_target_vendor %{_host_vendor}
- %_target_os %{_host_os}
+-%buildroot %{_tmppath}/%{name}-root
++%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
+
+ # The sub-directory (relative to %{_builddir}) where sources are compiled.
+ # This macro is set after processing %setup, either explicitly from the
+@@ -331,8 +332,8 @@
+ # "w9.gzdio" gzip level 9 (default).
+ # "w9.bzdio" bzip2 level 9.
+ #
+-#%_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)
+@@ -481,7 +482,7 @@
+
+ #
+ # Path to magic file used for file classification.
+-%_rpmfc_magic_path %{_usr}/lib/rpm/magic
++%_rpmfc_magic_path /usr/share/file/magic
+
+ #==============================================================================
+ # ---- Database configuration macros.
+@@ -929,10 +930,10 @@
+ export RPM_BUILD_ROOT}\
+ %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
+ export CLASSPATH}\
+- unset PERL_MM_OPT\
++ unset PERL_MM_OPT || :\
+ LANG=C\
+ export LANG\
+- unset DISPLAY\
++ unset DISPLAY || :\
+ \
+ %{verbose:set -x}%{!verbose:exec > /dev/null}\
+ umask 022\
+@@ -1371,5 +1372,23 @@
+ #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --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
+ #*/
+