Add librnp-rnp subpackage

SOURCES/thunderbird-redhat-default-prefs.js

@@ -2,7 +2,7 @@ pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
 /* Allow users to set custom colors*/
 /* pref("browser.display.use_system_colors",   true);*/
-pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendor", "AlmaLinux");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);

SPECS/thunderbird.spec

@@ -159,7 +159,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        102.3.0
-Release:        3%{?dist}
+Release:        3%{?dist}.alma.plus
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -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"
@@ -1098,7 +1098,7 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 %endif
 
 # Removing librnp.so - we cannot deliver that in RHELs
-%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so %{buildroot}%{mozappdir}/rnp-cli %{buildroot}%{mozappdir}/rnpkeys
+#{__rm} -rf %{buildroot}%{mozappdir}/librnp.so %{buildroot}%{mozappdir}/rnp-cli %{buildroot}%{mozappdir}/rnpkeys
 # Register as an application to be visible in the software center
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
 %{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml
@@ -1198,6 +1198,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Sun Oct 02 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.3.0-3.alma.plus
+- Debrand for AlmaLinux
+
 * Fri Sep 16 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-3
 - Update to 102.3.0 build1