From 402f9d36ae86e8c173658be808002ddf3567cc33 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Mon, 3 Oct 2022 10:06:56 +0000
Subject: [PATCH] Add librnp-rnp subpackage

---
 SPECS/thunderbird.spec | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 1b463ae..ef66962 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -352,7 +352,7 @@ BuildRequires:    xmlto
 %endif
 
 # Don't require any OpenPGP backend with the librnp interface, because RHEL does not have it
-#Requires:       thunderbird-librnp%{?_isa}
+Requires:       thunderbird-librnp%{?_isa}
 # prefer the librnp implementation bundled with thunderbird
 #Not in RHEL7 Suggests:       thunderbird-librnp-rnp%{?_isa}
 Requires:       p11-kit-trust
@@ -502,19 +502,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"