From 6defd9bbd4fe628aa2b2cd09b453666574bb17ed Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 20 Jun 2023 16:12:08 +0300
Subject: [PATCH] Enable openpgp

---
 SPECS/thunderbird.spec | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index f283c00..eb15b06 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -184,7 +184,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        102.12.0
-Release:        1%{?dist}.alma
+Release:        1%{?dist}.alma.plus
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -255,7 +255,7 @@ Patch224:        mozilla-1170092.patch
 Patch226:        rhbz-1354671.patch
 Patch228:        disable-openh264-download.patch
 Patch229:        firefox-nss-addon-hack.patch
-Patch230:        disable-openpgp-in-thunderbird.patch
+# Patch230:        disable-openpgp-in-thunderbird.patch
 
 # Upstream patches
 Patch415:        mozilla-1670333.patch
@@ -396,7 +396,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
@@ -570,19 +570,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"
@@ -1183,9 +1183,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 %endif
 
 # Removing librnp.so - we cannot deliver librnp with botan crypto backend RHELs
-%if !%{?use_openssl_for_librnp}
-%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so %{buildroot}%{mozappdir}/rnp-cli %{buildroot}%{mozappdir}/rnpkeys
-%endif
+# %if !%{?use_openssl_for_librnp}
+# %{__rm} -rf %{buildroot}%{mozappdir}/librnp.so %{buildroot}%{mozappdir}/rnp-cli %{buildroot}%{mozappdir}/rnpkeys
+# %endif
 
 # Register as an application to be visible in the software center
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
@@ -1291,6 +1291,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Jun 20 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.12.0-1.alma.plus
+- Enable openpgp
+
 * Tue Jun 20 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.12.0-1.alma
 - Debrand for AlmaLinux