---- rpm-4.4.3/macros.in 2005-11-19 01:19:50.657854672 +0100
-+++ rpm-4.4.6/macros.in 2006-05-24 11:49:38.438332239 +0300
-@@ -219,7 +219,7 @@
- %_tmppath %{_var}/tmp
+diff -urN rpm.org/macros.in rpm/macros.in
+--- rpm.org/macros.in 2007-10-02 20:46:56.430390000 +0200
++++ rpm/macros.in 2007-10-02 20:49:01.480941544 +0200
+@@ -213,7 +213,7 @@
+ %endif\
+ %{nil}
+
+-%_defaultdocdir %{_usr}/doc
++%_defaultdocdir %{_usr}/share/doc
+
+ # The path to the pgp executable (legacy, use %{__pgp} instead).
+ %_pgpbin %{__pgp}
+@@ -242,12 +242,12 @@
+ # The directory where newly built source packages will be written.
+ %_srcrpmdir %{_topdir}/SRPMS
+
+-# Directory where temporaray files can be created.
+-%_tmppath %{_var}/tmp
++# Directory where temporary files can be created.
++%_tmppath %(echo "${TMPDIR:-/tmp}")
+ %tmpdir %{_tmppath}
# Path to top of build area.
--%_topdir %{_usrsrc}/rpm
+-%_topdir @PKGSRCDIR_MACRO@
+%_topdir %(echo $HOME)/rpm
- # The path to the unzip executable (legacy, use %{__unzip} instead).
- %_unzipbin %{__unzip}
-@@ -330,8 +330,8 @@
- # "w9.gzdio" gzip level 9 (default).
+ #==============================================================================
+ # ---- Optional rpmrc macros.
+@@ -257,7 +257,7 @@
+ # Configurable build root path, same as BuildRoot: in a specfile.
+ # (Note: the configured macro value will override the spec file value).
+ #
+-%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
+@@ -356,8 +356,8 @@
# "w9.bzdio" bzip2 level 9.
+ # "w9.lzdio" lzma level 9.
#
-#%_source_payload w9.gzdio
-#%_binary_payload w9.gzdio
# Archive formats to use for source/binary package payloads.
# "cpio" cpio archive (default)
-@@ -932,10 +932,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\
-@@ -1374,4 +1374,17 @@
- #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --requires
+@@ -1224,17 +1224,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
+
+ #==============================================================================
+@@ -1535,7 +1535,33 @@
+ # 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
+
++# provides don't obsolete
++%_upgrade_tag name
++
+#-----------------------------------------------------------------
+# CFLAGS and LDFLAGS used to build
+
-+%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
++%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}
+
++# arch macros
++%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
++%x8664 x86_64 amd64 ia32e
++%ppc ppc ppc7400 ppc7450
++
# \endverbatim
#*/