]>
Commit | Line | Data |
---|---|---|
faecf1b6 | 1 | --- rpm-3.0.3/configure.in.wiget Thu Sep 30 23:25:29 1999 |
9983b570 | 2 | +++ rpm-3.0.3/configure.in Fri Oct 29 11:43:58 1999 |
faecf1b6 AF |
3 | @@ -903,7 +903,7 @@ |
4 | export LIBS INCPATH CONFIG_SITE | |
7856cf5d AF |
5 | |
6 | AC_CONFIG_SUBDIRS(popt) | |
7 | -AC_OUTPUT([Makefile rpmrc macros lib/Makefile | |
8 | +AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile | |
9 | build/Makefile tools/Makefile scripts/Makefile | |
10 | tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile | |
faecf1b6 AF |
11 | misc/Makefile po/Makefile.in intl/Makefile |
12 | --- rpm-3.0.3/macros.in.wiget Thu Sep 30 01:29:57 1999 | |
9983b570 | 13 | +++ rpm-3.0.3/macros.in Fri Oct 29 11:50:10 1999 |
faecf1b6 | 14 | @@ -60,8 +60,8 @@ |
d6f89cbe AF |
15 | %_builddir %{_topdir}/BUILD |
16 | %_buildshell /bin/sh | |
17 | %_bzip2bin @BZIP2BIN@ | |
18 | -%_dbpath %{_var}/lib/rpm | |
19 | -%_defaultdocdir %{_usr}/doc | |
09f6ceca | 20 | +%_dbpath %{_var}/state/rpm |
d6f89cbe | 21 | +%_defaultdocdir %{_usr}/share/doc |
faecf1b6 AF |
22 | # |
23 | %__find_provides @FINDPROVIDES@ | |
24 | %__find_requires @FINDREQUIRES@ | |
25 | @@ -70,8 +70,8 @@ | |
26 | #%__find_obsoletes ??? | |
d6f89cbe AF |
27 | # |
28 | # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup | |
faecf1b6 AF |
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@ | |
7856cf5d AF |
33 | %_fixperms %{__chmod} -Rf @FIXPERMS@ |
34 | # | |
35 | %_gzipbin @GZIPBIN@ | |
faecf1b6 | 36 | @@ -80,13 +80,13 @@ |
5a076bba | 37 | %_rpmdir %{_topdir}/RPMS |
e548b810 | 38 | # |
5a076bba AF |
39 | # XXX Note escaped %% for use in headerSprintf |
40 | -%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm | |
41 | +%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm | |
42 | %_signature none | |
43 | %_sourcedir %{_topdir}/SOURCES | |
44 | %_specdir %{_topdir}/SPECS | |
45 | %_srcrpmdir %{_topdir}/SRPMS | |
46 | %_tmppath %{_var}/tmp | |
e548b810 | 47 | -%_topdir %{_usrsrc}/redhat |
5a076bba AF |
48 | +%_topdir %(echo $HOME)/rpm |
49 | # | |
50 | #============================================================================== | |
51 | # ---- Optional rpmrc macros. | |
faecf1b6 | 52 | @@ -160,14 +160,14 @@ |
5eab636f AF |
53 | %_sbindir %{_exec_prefix}/sbin |
54 | %_libexecdir %{_exec_prefix}/libexec | |
55 | %_datadir %{_prefix}/share | |
56 | -%_sysconfdir %{_prefix}/etc | |
57 | +%_sysconfdir /etc | |
58 | %_sharedstatedir %{_prefix}/com | |
59 | %_localstatedir %{_prefix}/var | |
d6f89cbe AF |
60 | %_libdir %{_exec_prefix}/lib |
61 | %_includedir %{_prefix}/include | |
62 | %_oldincludedir /usr/include | |
9983b570 | 63 | -%_infodir %{_prefix}/info |
d6f89cbe | 64 | -%_mandir %{_prefix}/man |
9983b570 | 65 | +%_infodir %{_prefix}/share/info |
d6f89cbe | 66 | +%_mandir %{_prefix}/share/man |
e548b810 AF |
67 | |
68 | #============================================================================== | |
d6f89cbe | 69 | # ---- config.guess platform macros. |