RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: rpm Date: 28-Jun-2007 18:41:51
Branch: HEAD Handle: 2007062817415100
Modified files:
rpm macros.in
Log:
let _dbi_tags be selected based on _dbapi and use it to not use
'Depends' tag in SQLite-based RPM DB until we really have a
'temporary' database support (perhaps via special database filename
':memory:'?) for SQLite, too
Summary:
Revision Changes Path
1.167 +5 -3 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.166 -r1.167 macros.in
--- rpm/macros.in 28 Jun 2007 15:52:05 -0000 1.166
+++ rpm/macros.in 28 Jun 2007 16:41:51 -0000 1.167
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.166 2007/06/28 15:52:05 rse Exp $
+# $Id: macros.in,v 1.167 2007/06/28 16:41:51 rse 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
@@ -645,8 +645,10 @@
%{!?_rpmdb_rebuild:%{__dbi_sqlconfig_current}}\
%{nil}
-# database tags
-%_dbi_tags Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends:Pubkeys:Packagecolor
+# database tag configuration
+%_dbi_tags %{expand:%%{_dbi_tags_%{_dbapi_used}}}
+%_dbi_tags_3 Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Pubkeys:Packagecolor:Depends
+%_dbi_tags_4 Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Pubkeys:Packagecolor
# database configuration: Berkeley-DB [dbapi 3 hooks]
%_dbi_config_3 %{_dbi_btconfig}
@@ .
Received on Thu Jun 28 18:41:51 2007