From dd85459e98e4a70a673238d5aec6c794fd60dc09 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 4 Feb 2021 14:37:12 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/rpm.git#1089af6b8a5cd5516e3243a5557551337b8c491d --- rpm.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/rpm.spec b/rpm.spec index 60bd258..93cba32 100644 --- a/rpm.spec +++ b/rpm.spec @@ -22,7 +22,7 @@ # build with sqlite support? %bcond_without sqlite # build with bdb support? -%bcond_without bdb +%bcond_with bdb # build with internal Berkeley DB? %bcond_with int_bdb # build with bdb_ro support? @@ -32,7 +32,7 @@ %global rpmver 4.16.1.2 #global snapver rc1 -%global rel 4 +%global rel 6 %global sover 9 %global srcver %{rpmver}%{?snapver:-%{snapver}} @@ -344,7 +344,7 @@ done; --build=%{_target_platform} \ --host=%{_target_platform} \ --with-vendor=redhat \ - %{?with_bdb: --enable-bdb} \ + --enable-bdb=%{?with_bdb:yes}%{!?with_bdb:no} \ %{!?with_int_bdb: --with-external-db} \ %{!?with_plugins: --disable-plugins} \ --with-lua \ @@ -406,6 +406,7 @@ find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f # These live in perl-generators and python-rpm-generators now rm -f $RPM_BUILD_ROOT/%{rpmhome}/{perldeps.pl,perl.*,pythond*} rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*} +rm -rf $RPM_BUILD_ROOT/var/tmp %if %{with check} %check @@ -574,6 +575,16 @@ fi %doc doc/librpm/html/* %changelog +* Wed Feb 03 2021 Panu Matilainen - 4.16.1.2-6 +- Drop support for read-write Berkeley DB format (#1787311) + +* Wed Feb 03 2021 Panu Matilainen - 4.16.1.2-5 +- Make with/without bdb build option actually work +- Clean up unpackaged /var/tmp from the build root + +* Wed Jan 27 2021 Fedora Release Engineering - 4.16.1.2-4.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 22 2021 Mark Wielaard - 4.16.1.2-4 - Fix edit_attributes_str_comp_dir in Patch916 (#1919107)