---- rpm-2.93/macros.in.macros Thu Apr 8 17:51:13 1999
-+++ rpm-2.93/macros.in Thu Apr 8 18:02:34 1999
-@@ -66,13 +66,13 @@
- %_rpmdir %{_topdir}/RPMS
+--- 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.
#
- # XXX Note escaped %% for use in headerSprintf
--%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-+%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
- %_signature none
- %_sourcedir %{_topdir}/SOURCES
- %_specdir %{_topdir}/SPECS
- %_srcrpmdir %{_topdir}/SRPMS
- %_tmppath %{_var}/tmp
--%_topdir %{_usrsrc}/redhat
-+%_topdir %(echo $HOME)/rpm
- #
- #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -96,7 +96,7 @@
- #%_pgp_path
- #%_provides
- #%_timecheck
--#%vendor
-+%vendor PLD
-
- #==============================================================================
- # ---- per-platform macros.
+ %_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}