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

@@ -184,7 +184,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        102.15.1
-Release:        1%{?dist}
+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
@@ -387,7 +387,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
@@ -561,19 +561,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"
@@ -1167,9 +1167,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
@@ -1275,12 +1275,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Wed Sep 20 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.15.1-1.alma.plus
+- Enable openpgp
+
+* Wed Sep 20 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.15.1-1.alma
+- Debrand for AlmaLinux
 * Wed Sep 13 2023 Eike Rathke <erack@redhat.com> - 102.15.1-1
 - Update to 102.15.1
-
 * Mon Aug 28 2023 Eike Rathke <erack@redhat.com> - 102.15.0-1
 - Update to 102.15.0 build1
-
 * Wed Aug 09 2023 Eike Rathke <erack@redhat.com> - 102.14.0-3
 - Bump NVR to rebuild
 
@@ -1292,7 +1295,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 * Fri Jul 07 2023 Eike Rathke <erack@redhat.com> - 102.13.0-2
 - Update to 102.13.0 build2
-
 * Wed Jul 05 2023 Eike Rathke <erack@redhat.com> - 102.13.0-1
 - Update to 102.13.0 build1
 
@@ -1301,7 +1303,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 * Thu May 04 2023 Eike Rathke <erack@redhat.com> - 102.11.0-1
 - Update to 102.11.0 build1
-
 * Tue Apr 11 2023 Eike Rathke <erack@redhat.com> - 102.10.0-2
 - Update to 102.10.0 build2
 
@@ -1310,25 +1311,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 * Mon Mar 13 2023 Eike Rathke <erack@redhat.com> - 102.9.0-2
 - Update to 102.9.0 build1
-
 * Wed Feb 15 2023 Eike Rathke <erack@redhat.com> - 102.8.0-2
 - Update to 102.8.0 build2
-
 * Fri Feb 10 2023 Eike Rathke <erack@redhat.com> - 102.8.0-1
 - Update to 102.8.0 build1
 
 * Tue Jan 31 2023 Eike Rathke <erack@redhat.com> - 102.7.1-2
 - Update to 102.7.1 build2
-
 * Tue Jan 24 2023 Eike Rathke <erack@redhat.com> - 102.7.1-1
 - Update to 102.7.1 build1
-
 * Mon Jan 16 2023 Eike Rathke <erack@redhat.com> - 102.7.0-1
 - Update to 102.7.0 build1
 
 * Tue Dec 13 2022 Eike Rathke <erack@redhat.com> - 102.6.0-2
 - Update to 102.6.0 build2
-
 * Fri Dec 09 2022 Eike Rathke <erack@redhat.com> - 102.6.0-1
 - Update to 102.6.0 build1
 
@@ -1337,13 +1333,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 * Tue Nov 15 2022 Eike Rathke <erack@redhat.com> - 102.5.0-2
 - Update to 102.5.0 build2
-
 * Fri Nov 11 2022 Eike Rathke <erack@redhat.com> - 102.5.0-1
 - Update to 102.5.0 build1
 
 * Mon Oct 17 2022 Eike Rathke <erack@redhat.com> - 102.4.0-1
 - Update to 102.4.0 build1
-
 * Wed Oct 12 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-4
 - Fix for expat CVE-2022-40674