From 0eb64cd4cf29d3d9f7cc4d8b34c4f17c0f7fa259 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Nov 23 2022 09:23:14 +0000
Subject: Enabled librnp-rnp sub-package for thunderdbird


Signed-off-by: Fabian Arrotin <arrfab@centos.org>

---

diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index b622b7f..ed46dd0 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -353,8 +353,8 @@ BuildRequires:    gcc-c++
 BuildRequires:    xmlto
 %endif
 
-# Don't require any OpenPGP backend with the librnp interface, because RHEL does not have it
-#Requires:       thunderbird-librnp%{?_isa}
+# Don't require any OpenPGP backend with the librnp interface, because RHEL does not have it (but we build it in centos-plus)
+Requires:       thunderbird-librnp%{?_isa}
 # prefer the librnp implementation bundled with thunderbird
 #Not in RHEL7 Suggests:       thunderbird-librnp-rnp%{?_isa}
 Requires:       p11-kit-trust
@@ -528,19 +528,19 @@ Provides: bundled(nspr) = 4.34.0
 %description
 Mozilla Thunderbird is a standalone mail and newsgroup client.
 
-#%package librnp-rnp
-#Summary: OpenPGP implementation for Thunderbird based on RNP
-#Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-#Provides: thunderbird-librnp
-#Provides: thunderbird-librnp%{?_isa}
-#Conflicts: thunderbird-librnp%{?_isa}
-#%description librnp-rnp
-#The thunderbird-librnp-rnp package contains an OpenPGP implementation
-#based on RNP.
-#%files librnp-rnp
-#%{mozappdir}/librnp.so
-#%{mozappdir}/rnp-cli
-#%{mozappdir}/rnpkeys
+%package librnp-rnp
+Summary: OpenPGP implementation for Thunderbird based on RNP
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: thunderbird-librnp
+Provides: thunderbird-librnp%{?_isa}
+Conflicts: thunderbird-librnp%{?_isa}
+%description librnp-rnp
+The thunderbird-librnp-rnp package contains an OpenPGP implementation
+based on RNP.
+%files librnp-rnp
+%{mozappdir}/librnp.so
+%{mozappdir}/rnp-cli
+%{mozappdir}/rnpkeys
 
 %prep
 echo "Build environment"