Merge branch 'a8' into a8-plus

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

@@ -135,7 +135,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        115.9.0
-Release:        1%{?dist}
+Release:        1%{?dist}.alma.plus.1
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -292,6 +292,8 @@ BuildRequires:  rustfmt >= %{rust_version}
 BuildRequires:  rust >= %{rust_version}
 %endif
 
+Requires:       thunderbird-librnp%{?_isa}
+
 %if 0%{?rhel} == 9
 BuildRequires:  cargo
 BuildRequires:  clang clang-libs llvm llvm-devel
@@ -894,6 +896,20 @@ Provides: bundled(crate(zeitstempel)) = 0.1.1
 %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
+
 %prep
 echo "Build environment"
 echo "--------------------------------------------"
@@ -1412,9 +1428,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
 # Removing librnp.so - we cannot deliver librnp with botan crypto backend RHELs
-%if !%{?use_openssl_for_librnp}
+# %if !%{?use_openssl_for_librnp}
-%{__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
-%endif
+# %endif
 
 # Register as an application to be visible in the software center
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
@@ -1516,6 +1532,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Apr 02 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.9.0-1.alma.1
+- Debrand for AlmaLinux
+- Enable OpenPGP
+
 * Mon Mar 18 2024 Eike Rathke <erack@redhat.com> - 115.9.0-1
 - Update to 115.9.0 build1
 - Fix expat CVE-2023-52425