eliminate old rpmrc configuration syntax.

CVS patchset: 2905
CVS date: 1999/03/20 21:09:47

1 files changed, 49 insertions, 13 deletions

diff --git a/tests/macros.in b/tests/macros.in
index d5f3685ff..22aab9965 100644
--- a/tests/macros.in
+++ b/tests/macros.in
@@ -1,9 +1,12 @@
-# $Id: macros.in,v 1.11 1999/03/14 00:35:06 jbj Exp $
+# $Id: macros.in,v 1.12 1999/03/20 21:10:10 jbj Exp $
 #==============================================================================
 # Macro naming conventions (preliminary):
 #
 #	Macros that begin with an underscore are "local" in the sense that
-#	they (if used) will not be exported in rpm headers.
+#	they (if used) will not be exported in rpm headers. Some macros
+#	that don't start with an underscore (but look like they should)
+#	are compatible with macros generated by rpm-2.5.x and will be made
+#	more consistent in a future release.
 #
 
 #==============================================================================
@@ -33,24 +36,57 @@
 %__tar                   %(which tar)
 
 #==============================================================================
-# ---- rpmrc macros.
-#	Macros that are initialized as a side effect of rpmrc parsing.
-#	These are the default values that will be overridden by any
-#	explicit values found in /usr/lib/rpm/rpmrc or /etc/rpmrc.
+# ---- Required rpmrc macros.
+#	Macros that used to be initialized as a side effect of rpmrc parsing.
+#	These are the default values that can be overridden by other
+#	(e.g. per-platform, per-system, per-packager) macro files.
 #
 %_builddir		%{_topdir}/BUILD
-%_bzip2bin		@BZIP2BIN@
+%_buildshell		@testdir@/bin/sh
+%_bzip2bin		@testdir@@BZIP2BIN@
 %_dbpath		%{_var}/lib/rpm
-%_defaultdocdir		/usr/doc
-%_fixperms		@FIXPERMS@
-%_gzipbin		@GZIPBIN@
+%_defaultdocdir		%{_usr}/doc
+#
+# XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
+#%_fixowner		chown -R root
+#%_fixgroup		chgrp -R @ROOT_GROUP@
+%_fixperms		chmod -R @FIXPERMS@
+#
+%_gzipbin		@testdir@@GZIPBIN@
+%_instchangelog		5
 %_rpmdir		%{_topdir}/RPMS
-%_rpmfilename		%{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
+#
+# XXX Note escaped %% for use in headerSprintf
+%_rpmfilename		%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
+%_signature		none
 %_sourcedir		%{_topdir}/SOURCES
 %_specdir		%{_topdir}/SPECS
 %_srcrpmdir		%{_topdir}/SRPMS
 %_tmppath		%{_var}/tmp
 %_topdir		%{_usrsrc}/redhat
+#
+#==============================================================================
+# ---- Optional rpmrc macros.
+#	Macros that used to be initialized as a side effect of rpmrc and/or
+#	spec file parsing but were not set in the distributed configuration 
+#	/usr/lib/rpm/rpmrc file.
+#
+#%buildroot
+#%distribution
+#%_excludedocs
+#%_ftpport
+#%_ftpproxy
+#%_gpg_name
+#%_gpg_path
+#%_httpport
+#%_httpproxy
+#%_langpatt
+#%_netsharedpath
+#%packager
+#%_pgp_name
+#%_pgp_path
+#%_provides
+#%_timecheck
 
 #==============================================================================
 # ---- per-platform macros.
@@ -58,9 +94,9 @@
 #	will be used if the per-platform macro file does not exist..
 #
 %_arch			@RPMCANONARCH@
-%_vendor		@RPMCANONVENDOR@
+%vendor			@RPMCANONVENDOR@
 %_os			@RPMCANONOS@
-%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}
+%_target_platform	%{_target_cpu}-%{vendor}-%{_target_os}
 #
 # XXX use the rpmrc instantiated macro for now
 #%optflags		-O2