up2date functional on rpm-python-4.1 bindings.

CVS patchset: 5558
CVS date: 2002/07/18 21:42:18

1 files changed, 7 insertions, 5 deletions

diff --git a/macros.in b/macros.in
index 62167b540..9677e3c35 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: /usr/lib/rpm/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.108 2002/07/05 16:51:57 jbj Exp $
+# $Id: macros.in,v 1.109 2002/07/18 21:42:19 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -512,14 +512,16 @@
 %_build_name_fmt	%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
 
 #	The path to the dependency universe database. The default value
-#	is the rpmdb-redhat location.
-%_sdbpath	/usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat
+#	is the rpmdb-redhat location. The macro is usually defined in
+#	/etc/rpm/macros.solve, installed with the rpmdb-redhat package.
+#%_solve_dbpath	/usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat
 
 #	The output binary package file name template used when suggesting
-#	binary packages that solve a dependency.
+#	binary packages that solve a dependency. The macro is usually defined
+#	in /etc/rpm/macros.solve, installed with the rpmdb-redhat package.
 #
 # XXX	Note: escaped %% for use in headerSprintf()
-%_solve_name_fmt	%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
+#%_solve_name_fmt	%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
 
 #	The output binary package file name template used when repackaging
 #	erased packages.