From 8b34570da21ddd732841d9e2d4ed111f590237a3 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 20 Sep 2020 16:01:11 +0200 Subject: [PATCH] Remove upstreamed patch --- nss-disable-legacydb.patch | 14 -------------- nss.spec | 4 ---- 2 files changed, 18 deletions(-) delete mode 100644 nss-disable-legacydb.patch diff --git a/nss-disable-legacydb.patch b/nss-disable-legacydb.patch deleted file mode 100644 index 0edb9d9..0000000 --- a/nss-disable-legacydb.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up nss/lib/softoken/Makefile.dbm nss/lib/softoken/Makefile -diff -up nss/lib/softoken/manifest.mn.dbm nss/lib/softoken/manifest.mn ---- nss/lib/softoken/manifest.mn.dbm 2020-08-13 11:03:53.511561201 +0200 -+++ nss/lib/softoken/manifest.mn 2020-08-13 11:05:17.148194158 +0200 -@@ -5,7 +5,9 @@ - CORE_DEPTH = ../.. - - MODULE = nss -+ifndef NSS_DISABLE_DBM - DIRS = legacydb -+endif - - LIBRARY_NAME = softokn - LIBRARY_VERSION = 3 diff --git a/nss.spec b/nss.spec index 7453cc8..92e658f 100644 --- a/nss.spec +++ b/nss.spec @@ -106,10 +106,6 @@ Patch2: nss-539183.patch # Once the buildroot aha been bootstrapped the patch may be removed # but it doesn't hurt to keep it. Patch4: iquote.patch -%if %{with dbm} -%else -Patch11: nss-disable-legacydb.patch -%endif Patch12: nss-signtool-format.patch %if 0%{?fedora} < 34 %if 0%{?rhel} < 9