1 diff -urN rpm-3.0.5.orig/configure.in rpm-3.0.5/configure.in
2 --- rpm-3.0.5.orig/configure.in Sun Jul 16 21:02:26 2000
3 +++ rpm-3.0.5/configure.in Sat Jul 29 23:58:18 2000
5 dnl export LIBS INCPATH CONFIG_SITE
7 AC_CONFIG_SUBDIRS(popt)
8 -AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
9 +AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt scripts/brp-redhat
10 lib/Makefile build/Makefile tools/Makefile scripts/Makefile
11 tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
12 misc/Makefile po/Makefile.in intl/Makefile
13 diff -Nru rpm-3.0.6/macros.in rpm-3.0.6.new/macros.in
14 --- rpm-3.0.6/macros.in Mon Nov 6 20:36:09 2000
15 +++ rpm-3.0.6.new/macros.in Mon Nov 6 20:37:24 2000
18 %_dbpath %{_var}/lib/rpm
19 %_dbpath_rebuild %{_dbpath}
20 -%_defaultdocdir %{_usr}/doc
21 +%_defaultdocdir %{_usr}/share/doc
23 %__find_provides @FINDPROVIDES@
24 %__find_requires @FINDREQUIRES@
27 %__chown_Rhf @__CHOWN_RHF@
28 %__chgrp_Rhf @__CHGRP_RHF@
29 -%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
30 -%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@
31 +%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root.@ROOT_GROUP@
32 +#%_fixgroup [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@
33 %_fixperms %{__chmod} -Rf @FIXPERMS@
37 %_rpmdir %{_topdir}/RPMS
39 # XXX Note escaped %% for use in headerSprintf
40 -%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
41 +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
43 %_sourcedir %{_topdir}/SOURCES
44 %_specdir %{_topdir}/SPECS
45 %_srcrpmdir %{_topdir}/SRPMS
47 -%_topdir %{_usrsrc}/redhat
48 +%_topdir %(echo $HOME)/rpm
50 #==============================================================================
51 # ---- Optional rpmrc macros.
53 %_sbindir %{_exec_prefix}/sbin
54 %_libexecdir %{_exec_prefix}/libexec
55 %_datadir %{_prefix}/share
56 -%_sysconfdir %{_prefix}/etc
58 %_sharedstatedir %{_prefix}/com
59 %_localstatedir %{_prefix}/var
61 %_libdir %{_exec_prefix}/%{_lib}
62 %_includedir %{_prefix}/include
63 %_oldincludedir /usr/include
64 -%_infodir %{_prefix}/info
65 -%_mandir %{_prefix}/man
66 +%_infodir /usr/share/info
67 +%_mandir %{_prefix}/share/man
69 #==============================================================================
70 # ---- config.guess platform macros.