lib/Makefile build/Makefile tools/Makefile scripts/Makefile
tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
misc/Makefile po/Makefile.in intl/Makefile
-diff -urN rpm-3.0.5.orig/macros.in rpm-3.0.5/macros.in
---- rpm-3.0.5.orig/macros.in Sun Jul 9 17:35:56 2000
-+++ rpm-3.0.5/macros.in Sat Jul 29 23:59:21 2000
-@@ -82,7 +82,7 @@
+diff -Nru rpm-3.0.6/macros.in rpm-3.0.6.new/macros.in
+--- rpm-3.0.6/macros.in Mon Nov 6 20:36:09 2000
++++ rpm-3.0.6.new/macros.in Mon Nov 6 20:37:24 2000
+@@ -88,7 +88,7 @@
%_bzip2bin @BZIP2BIN@
%_dbpath %{_var}/lib/rpm
%_dbpath_rebuild %{_dbpath}
#
%__find_provides @FINDPROVIDES@
%__find_requires @FINDREQUIRES@
-@@ -94,8 +94,8 @@
+@@ -100,8 +100,8 @@
%__id_u @__ID_U@
%__chown_Rhf @__CHOWN_RHF@
%__chgrp_Rhf @__CHGRP_RHF@
%_fixperms %{__chmod} -Rf @FIXPERMS@
#
%_gzipbin @GZIPBIN@
-@@ -104,13 +104,13 @@
+@@ -110,13 +110,13 @@
%_rpmdir %{_topdir}/RPMS
#
# XXX Note escaped %% for use in headerSprintf
#==============================================================================
# ---- Optional rpmrc macros.
-@@ -401,15 +401,15 @@
+@@ -407,15 +407,15 @@
%_sbindir %{_exec_prefix}/sbin
%_libexecdir %{_exec_prefix}/libexec
%_datadir %{_prefix}/share
%_oldincludedir /usr/include
-%_infodir %{_prefix}/info
-%_mandir %{_prefix}/man
-+%_infodir %{_prefix}/share/info
++%_infodir /usr/share/info
+%_mandir %{_prefix}/share/man
#==============================================================================