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:   03-Jan-2008 11:55:39
  Branch: HEAD                             Handle: 2008010310553900

  Modified files:
    rpm                     CHANGES macros.in

  Log:
    Fix database configuration for recently added indices "Nvra" and
    "Sourcepkgid".

  Summary:
    Revision    Changes     Path
    1.2051      +1  -0      rpm/CHANGES
    1.226       +8  -4      rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2050 -r1.2051 CHANGES
  --- rpm/CHANGES	2 Jan 2008 21:45:45 -0000	1.2050
  +++ rpm/CHANGES	3 Jan 2008 10:55:39 -0000	1.2051
  @@ -1,4 +1,5 @@
   5.0b4 -> 5.0.0:
  +    - rse: fix database configuration for recently added indices "Nvra" and "Sourcepkgid"
       - jbj: differentiate %warn and %error (now stops) behavior (from openpkg).
       - jbj: merge %{realpath:...}. won't hurt a thing (from openpkg).
       - jbj: set macro_BUFSIZ as 16K independent of BUFSIZ (from openpkg).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.225 -r1.226 macros.in
  --- rpm/macros.in	1 Jan 2008 02:00:16 -0000	1.225
  +++ rpm/macros.in	3 Jan 2008 10:55:39 -0000	1.226
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.225 2008/01/01 02:00:16 mej Exp $
  +# $Id: macros.in,v 1.226 2008/01/03 10:55:39 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
  @@ -679,7 +679,7 @@
   
   # 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:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Foo:Bar:Baz
  +%_dbi_tags_3                    Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid
   %_dbi_tags_4                    Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid
   
   # database configuration: Berkeley-DB [dbapi 3 hooks]
  @@ -703,7 +703,8 @@
   %_dbi_config_3_Triggername      %{_dbi_btconfig}
   %_dbi_config_3_Packages         %{_dbi_btconfig} lockdbfd
   %_dbi_config_3_Depends          %{_dbi_btconfig} temporary private
  -%_dbi_config_3_Nvra		%{_dbi_btconfig} noload
  +%_dbi_config_3_Nvra             %{_dbi_btconfig} noload
  +%_dbi_config_3_Sourcepkgid      %{_dbi_btconfig}
   
   # database configuration: SQLite [dbapi 4 hooks]
   %_dbi_config_4                  %{_dbi_sqlconfig}
  @@ -726,7 +727,8 @@
   %_dbi_config_4_Triggername      %{_dbi_sqlconfig}
   %_dbi_config_4_Packages         %{_dbi_sqlconfig}
   %_dbi_config_4_Depends          %{_dbi_sqlconfig} temporary private
  -%_dbi_config_4_Nvra		%{_dbi_btconfig} noload
  +%_dbi_config_4_Nvra             %{_dbi_sqlconfig} noload
  +%_dbi_config_4_Sourcepkgid      %{_dbi_sqlconfig}
   
   # database configuration [code entry hooks]
   %_dbi_config                    %{expand:%%{_dbi_config_%{_dbapi_used}}}
  @@ -749,6 +751,8 @@
   %_dbi_config_Triggername        %{expand:%%{_dbi_config_%{_dbapi_used}_Triggername}}
   %_dbi_config_Packages           %{expand:%%{_dbi_config_%{_dbapi_used}_Packages}}
   %_dbi_config_Depends            %{expand:%%{_dbi_config_%{_dbapi_used}_Depends}}
  +%_dbi_config_Nvra               %{expand:%%{_dbi_config_%{_dbapi_used}_Nvra}}
  +%_dbi_config_Sourcepkgid        %{expand:%%{_dbi_config_%{_dbapi_used}_Sourcepkgid}}
   
   # Database API configuration:
   #
  @@ .