]> git.pld-linux.org Git - packages/rpm.git/blame - rpm-macros.patch
- s#%{_prefix}/lib#%{_libdir}#,
[packages/rpm.git] / rpm-macros.patch
CommitLineData
7856cf5d
AF
1diff -ur rpm-3.0.1.old/configure.in rpm-3.0.1/configure.in
2--- rpm-3.0.1.old/configure.in Fri Jun 4 18:21:31 1999
3+++ rpm-3.0.1/configure.in Fri Jun 4 18:22:00 1999
4@@ -781,7 +781,7 @@
5 export LIBS INCPATH
6
7 AC_CONFIG_SUBDIRS(popt)
8-AC_OUTPUT([Makefile rpmrc macros lib/Makefile
9+AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
10 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],
13Only in rpm-3.0.1: configure.in~
14diff -ur rpm-3.0.1.old/macros.in rpm-3.0.1/macros.in
15--- rpm-3.0.1.old/macros.in Fri May 14 20:59:43 1999
16+++ rpm-3.0.1/macros.in Fri Jun 4 18:28:25 1999
17@@ -60,12 +60,12 @@
d6f89cbe
AF
18 %_builddir %{_topdir}/BUILD
19 %_buildshell /bin/sh
20 %_bzip2bin @BZIP2BIN@
21-%_dbpath %{_var}/lib/rpm
22-%_defaultdocdir %{_usr}/doc
23+%_dbpath %{_var}/db/rpm
24+%_defaultdocdir %{_usr}/share/doc
25 #
26 # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
7856cf5d
AF
27-%_fixowner [ `%{__id} -u` = '0' ] && %{__chown} -Rf root
28-%_fixgroup [ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
29+%_fixowner [ `%{__id} -u` = '0' ] && %{__chown} -Rf root.@ROOT_GROUP@
30+#%_fixgroup [ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
31 %_fixperms %{__chmod} -Rf @FIXPERMS@
32 #
33 %_gzipbin @GZIPBIN@
34@@ -74,13 +74,13 @@
5a076bba 35 %_rpmdir %{_topdir}/RPMS
e548b810 36 #
5a076bba
AF
37 # XXX Note escaped %% for use in headerSprintf
38-%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
39+%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
40 %_signature none
41 %_sourcedir %{_topdir}/SOURCES
42 %_specdir %{_topdir}/SPECS
43 %_srcrpmdir %{_topdir}/SRPMS
44 %_tmppath %{_var}/tmp
e548b810 45-%_topdir %{_usrsrc}/redhat
5a076bba
AF
46+%_topdir %(echo $HOME)/rpm
47 #
48 #==============================================================================
49 # ---- Optional rpmrc macros.
7856cf5d 50@@ -159,8 +159,8 @@
d6f89cbe
AF
51 %_libdir %{_exec_prefix}/lib
52 %_includedir %{_prefix}/include
53 %_oldincludedir /usr/include
54-%_infodir %{_prefix}/include
55-%_mandir %{_prefix}/man
c96842a9 56+%_infodir /usr/share/info
d6f89cbe 57+%_mandir %{_prefix}/share/man
e548b810
AF
58
59 #==============================================================================
d6f89cbe 60 # ---- config.guess platform macros.
7856cf5d 61Only in rpm-3.0.1: macros.in~
This page took 0.03597 seconds and 4 git commands to generate.