---- rpm-4.4.8/macros.in.orig 2007-04-08 20:24:47.206783474 +0200
-+++ rpm-4.4.8/macros.in 2007-04-08 20:36:08.925632417 +0200
-@@ -206,7 +206,7 @@
+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}
# The path to the pgp executable (legacy, use %{__pgp} instead).
%_pgpbin %{__pgp}
-@@ -233,12 +233,12 @@
+@@ -242,12 +242,12 @@
# The directory where newly built source packages will be written.
%_srcrpmdir %{_topdir}/SRPMS
%tmpdir %{_tmppath}
# Path to top of build area.
--%_topdir %{_usrsrc}/rpm
+-%_topdir @PKGSRCDIR_MACRO@
+%_topdir %(echo $HOME)/rpm
#==============================================================================
# ---- Optional rpmrc macros.
-@@ -248,7 +248,7 @@
+@@ -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).
#
# The sub-directory (relative to %{_builddir}) where sources are compiled.
# This macro is set after processing %setup, either explicitly from the
-@@ -347,8 +347,8 @@
+@@ -356,8 +356,8 @@
# "w9.bzdio" bzip2 level 9.
# "w9.lzdio" lzma level 9.
#
# 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 %{_usr}/lib/rpm/magic
-+%_rpmfc_magic_path /usr/share/file/magic
-
- #==============================================================================
- # ---- Database configuration macros.
-@@ -757,7 +757,7 @@
-
- # Open all indices before doing chroot(2).
- #
--%_openall_before_chroot 0
-+%_openall_before_chroot 1
-
- # The path to the dependency universe database. The default value
- # is the rpmdb-vendor location. The macro is usually defined in
-@@ -1127,17 +1127,17 @@
+@@ -1224,17 +1224,17 @@
%_exec_prefix %{_prefix}
%_bindir %{_exec_prefix}/bin
%_sbindir %{_exec_prefix}/sbin
%_localedir %{_datadir}/locale
#==============================================================================
-@@ -1428,7 +1428,25 @@
- # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
- #%__executable_provides %{_usrlibrpm}/executabledeps.sh --provides
- #%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires
--%__scriptlet_requires /bin/bash --rpm-requires
-+#%__scriptlet_requires /bin/bash --rpm-requires
+@@ -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 %{__bash} --rpm-requires
++#%__scriptlet_requires %{__bash} --rpm-requires
+# PLD rpm macros
+%_enable_debug_packages 1
+
++# provides don't obsolete
++%_upgrade_tag name
++
+#-----------------------------------------------------------------
+# CFLAGS and LDFLAGS used to build
+
+%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
#*/
---- rpm-4.4.8/configure.ac.orig 2007-04-08 20:24:47.210783702 +0200
-+++ rpm-4.4.8/configure.ac 2007-04-08 20:32:18.216485052 +0200
-@@ -1462,7 +1462,7 @@
- [Full path to rpm system configuration directory (usually /etc/rpm)])
- AC_SUBST(SYSCONFIGDIR)
-
--MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
-+MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros"
- AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
- [Colon separated paths of macro files to read.])
- AC_SUBST(MACROFILES)