RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 14-Oct-2008 23:47:49
Branch: HEAD Handle: 2008101421474900
Modified files:
rpm CHANGES macros.in
Log:
- generate Obsoletename index.
Summary:
Revision Changes Path
1.2609 +1 -0 rpm/CHANGES
1.256 +21 -19 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2608 -r1.2609 CHANGES
--- rpm/CHANGES 14 Oct 2008 20:51:50 -0000 1.2608
+++ rpm/CHANGES 14 Oct 2008 21:47:49 -0000 1.2609
@@ -1,5 +1,6 @@
5.2a1 -> 5.2a2:
+ - jbj: generate Obsoletename index.
- jbj: use rpmdsMatch to detect rpmdb trigger firing.
- jbj: add rpmdsMatch to match dependency against set.
- jbj: refactor the sumNN wrappers out of digest.c too.
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.255 -r1.256 macros.in
--- rpm/macros.in 12 Oct 2008 08:27:45 -0000 1.255
+++ rpm/macros.in 14 Oct 2008 21:47:49 -0000 1.256
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.255 2008/10/12 08:27:45 jbj Exp $
+# $Id: macros.in,v 1.256 2008/10/14 21:47:49 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
@@ -686,58 +686,60 @@
# 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:Filepaths
-%_dbi_tags_4
Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
+%_dbi_tags_3
Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
+%_dbi_tags_4
Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
# database configuration: Berkeley-DB [dbapi 3 hooks]
%_dbi_config_3 %{_dbi_btconfig}
-%_dbi_config_3_Dirnames %{_dbi_btconfig}
-%_dbi_config_3_Requireversion %{_dbi_btconfig}
-%_dbi_config_3_Provideversion %{_dbi_btconfig}
-%_dbi_config_3_Installtid %{_dbi_btconfig}
-%_dbi_config_3_Removetid %{_dbi_btconfig}
%_dbi_config_3_Basenames %{_dbi_btconfig}
%_dbi_config_3_Conflictname %{_dbi_btconfig}
+%_dbi_config_3_Dirnames %{_dbi_btconfig}
%_dbi_config_3_Filedigests %{_dbi_htconfig}
+%_dbi_config_3_Filepaths %{_dbi_btconfig}
%_dbi_config_3_Group %{_dbi_btconfig}
+%_dbi_config_3_Installtid %{_dbi_btconfig}
%_dbi_config_3_Name %{_dbi_btconfig}
+%_dbi_config_3_Nvra %{_dbi_btconfig} noload
+%_dbi_config_3_Obsoletename %{_dbi_btconfig}
%_dbi_config_3_Packagecolor %{_dbi_htconfig}
%_dbi_config_3_Providename %{_dbi_btconfig}
+%_dbi_config_3_Provideversion %{_dbi_btconfig}
%_dbi_config_3_Pubkeys %{_dbi_htconfig}
+%_dbi_config_3_Removetid %{_dbi_btconfig}
%_dbi_config_3_Requirename %{_dbi_btconfig}
+%_dbi_config_3_Requireversion %{_dbi_btconfig}
%_dbi_config_3_Sha1header %{_dbi_htconfig}
%_dbi_config_3_Sigmd5 %{_dbi_htconfig}
+%_dbi_config_3_Sourcepkgid %{_dbi_btconfig}
%_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_Sourcepkgid %{_dbi_btconfig}
-%_dbi_config_3_Filepaths %{_dbi_btconfig}
# database configuration: SQLite [dbapi 4 hooks]
%_dbi_config_4 %{_dbi_sqlconfig}
-%_dbi_config_4_Dirnames %{_dbi_sqlconfig}
-%_dbi_config_4_Requireversion %{_dbi_sqlconfig}
-%_dbi_config_4_Provideversion %{_dbi_sqlconfig}
-%_dbi_config_4_Installtid %{_dbi_sqlconfig}
-%_dbi_config_4_Removetid %{_dbi_sqlconfig}
%_dbi_config_4_Basenames %{_dbi_sqlconfig}
%_dbi_config_4_Conflictname %{_dbi_sqlconfig}
+%_dbi_config_4_Dirnames %{_dbi_sqlconfig}
%_dbi_config_4_Filedigests %{_dbi_sqlconfig}
+%_dbi_config_4_Filepaths %{_dbi_sqlconfig}
%_dbi_config_4_Group %{_dbi_sqlconfig}
+%_dbi_config_4_Installtid %{_dbi_sqlconfig}
%_dbi_config_4_Name %{_dbi_sqlconfig}
+%_dbi_config_4_Nvra %{_dbi_sqlconfig} noload
+%_dbi_config_4_Obsoletename %{_dbi_sqlconfig}
%_dbi_config_4_Packagecolor %{_dbi_sqlconfig}
%_dbi_config_4_Providename %{_dbi_sqlconfig}
+%_dbi_config_4_Provideversion %{_dbi_sqlconfig}
%_dbi_config_4_Pubkeys %{_dbi_sqlconfig}
+%_dbi_config_4_Removetid %{_dbi_sqlconfig}
%_dbi_config_4_Requirename %{_dbi_sqlconfig}
+%_dbi_config_4_Requireversion %{_dbi_sqlconfig}
%_dbi_config_4_Sha1header %{_dbi_sqlconfig}
%_dbi_config_4_Sigmd5 %{_dbi_sqlconfig}
+%_dbi_config_4_Sourcepkgid %{_dbi_sqlconfig}
%_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_sqlconfig} noload
-%_dbi_config_4_Sourcepkgid %{_dbi_sqlconfig}
-%_dbi_config_4_Filepaths %{_dbi_sqlconfig}
# database configuration [code entry hooks]
%_dbi_config %{expand:%%{_dbi_config_%{_dbapi_used}}}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
