From b6080710d76af755c4f05ffe26f22b28520790da Mon Sep 17 00:00:00 2001 From: chantra Date: Jun 22 2022 00:14:45 +0000 Subject: Revert "[rpm][ndb] Use ndb database by default" This reverts commit e62c0500274012ca77817a24814de38944c8abd4. --- diff --git a/SOURCES/ndb_default.patch b/SOURCES/ndb_default.patch deleted file mode 100644 index b1df489..0000000 --- a/SOURCES/ndb_default.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e19943a57c07eb0f2d2925390413f15bf771e828 Mon Sep 17 00:00:00 2001 -From: Matthew Almond -Date: Fri, 7 Jan 2022 10:33:28 -0800 -Subject: [PATCH] Switch from bdb to ndb - ---- - macros.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/macros.in b/macros.in -index abf0ed1fe..731341925 100644 ---- a/macros.in -+++ b/macros.in -@@ -595,7 +595,7 @@ package or when debugging this package.\ - # ndb new data base format - # sqlite Sqlite database (read-only in this version!) - # --%_db_backend bdb -+%_db_backend ndb - - # - # Macros used to configure Berkley db parameters. --- -2.30.2 - diff --git a/SPECS/rpm.spec b/SPECS/rpm.spec index 0191e89..f60ea99 100644 --- a/SPECS/rpm.spec +++ b/SPECS/rpm.spec @@ -42,7 +42,7 @@ %global rpmver 4.14.3 #global snapver rc2 -%global rel 23.1 +%global rel 23.2 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -195,13 +195,12 @@ Patch1983: 0034-rpmsign-Adopting-PKCS11-opaque-keys-support-in-libfsverity-for-f %endif %if %{with ndb} -Patch9000: ndb_default.patch # GH#1040 Patch9001: ndb_query_ro_media.patch %endif -Patch9800: 1534.patch -Patch9801: https://github.com/rpm-software-management/rpm/pull/1381.patch +Patch9989: 1534.patch +Patch9990: https://github.com/rpm-software-management/rpm/pull/1381.patch Provides: rpm(pr1381) # Copy-on-Write @@ -832,6 +831,9 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog +* Tue Jun 21 2022 Manu Bretelle - 4.14.3-23.2 +- Revert ndb by default (e62c0500274012ca77817a24814de38944c8abd4) + * Mon May 16 2022 Manu Bretelle - 4.14.3-23.1 - Rebuild for Hyperscale