1 diff -Nru rpm-4.0.1/configure.in rpm-4.0.1.new/configure.in
2 --- rpm-4.0.1/configure.in Wed Jan 31 13:22:16 2001
3 +++ rpm-4.0.1.new/configure.in Wed Jan 31 13:23:24 2001
5 dnl export LIBS INCPATH CONFIG_SITE
7 AC_CONFIG_SUBDIRS(popt)
8 -AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat
9 +AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt rpm.spec scripts/brp-redhat
10 rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
12 tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
13 diff -Nru rpm-4.0.1/macros.in rpm-4.0.1.new/macros.in
14 --- rpm-4.0.1/macros.in Wed Jan 31 13:22:16 2001
15 +++ rpm-4.0.1.new/macros.in Wed Jan 31 13:24:31 2001
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
51 #==============================================================================
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
62 %_libdir %{_exec_prefix}/%{_lib}
63 %_includedir %{_prefix}/include
64 %_oldincludedir /usr/include
65 -%_infodir %{_prefix}/info
66 -%_mandir %{_prefix}/man
67 +%_infodir /usr/share/info
68 +%_mandir %{_prefix}/share/man
70 #==============================================================================
71 # ---- config.guess platform macros.