--- /dev/null
+diff -u -u -r1.159.2.1 -r1.159.2.2
+--- rpm/macros.in 25 May 2007 19:00:34 -0000 1.159.2.1
++++ rpm/macros.in 31 May 2007 10:43:34 -0000 1.159.2.2
+@@ -634,21 +634,21 @@
+ %_dbi_config_Installtid %{_dbi_btconfig}
+ %_dbi_config_Removetid %{_dbi_btconfig}
+
+-%_dbi_config_Basenames %{_dbi_btconfig}
+-%_dbi_config_Conflictname %{_dbi_btconfig}
++%_dbi_config_Basenames %{_dbi_htconfig}
++%_dbi_config_Conflictname %{_dbi_htconfig}
+ %_dbi_config_Filedigests %{_dbi_htconfig}
+-%_dbi_config_Group %{_dbi_btconfig}
+-%_dbi_config_Name %{_dbi_btconfig}
++%_dbi_config_Group %{_dbi_htconfig}
++%_dbi_config_Name %{_dbi_htconfig}
+ %_dbi_config_Packagecolor %{_dbi_htconfig}
+-%_dbi_config_Providename %{_dbi_btconfig}
++%_dbi_config_Providename %{_dbi_htconfig}
+ %_dbi_config_Pubkeys %{_dbi_htconfig}
+-%_dbi_config_Requirename %{_dbi_btconfig}
++%_dbi_config_Requirename %{_dbi_htconfig}
+ %_dbi_config_Sha1header %{_dbi_htconfig}
+ %_dbi_config_Sigmd5 %{_dbi_htconfig}
+-%_dbi_config_Triggername %{_dbi_btconfig}
++%_dbi_config_Triggername %{_dbi_htconfig}
+
+ # "Packages" should have shared/exclusive fcntl(2) lock using "lockdbfd".
+-%_dbi_config_Packages %{_dbi_btconfig} lockdbfd
++%_dbi_config_Packages %{_dbi_htconfig} lockdbfd
+
+ # "Depends" is a per-transaction cache of known dependency resolutions.
+ %_dbi_config_Depends %{_dbi_btconfig} temporary private