Merge branch 'c8' into a8

- Update 115.10.0.b2
Merge pull request 'Add Obsoletes to thunderbird-librnp-rnp package' (#1 ) from a8-remove-plus into a8
2024-05-20 10:08:20 +03:00 · 2024-04-24 17:34:45 +03:00 · 2024-04-22 14:50:38 +00:00 · 2024-04-22 17:47:28 +03:00 · 2024-04-02 08:51:01 +00:00 · 2024-02-27 20:26:44 +03:00
2 changed files with 8 additions and 3 deletions
--- a/SOURCES/thunderbird-redhat-default-prefs.js
+++ b/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);
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@ -135,7 +135,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        115.11.0
-Release:        1%{?dist}
+Release:        1%{?dist}.alma.1
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+

@ -889,6 +889,9 @@ Provides: bundled(crate(xpcom)) = 0.1.0
 Provides: bundled(crate(xpcom_macros)) = 0.1.0
 Provides: bundled(crate(zeitstempel)) = 0.1.1

+%if %{?use_openssl_for_librnp}
+Obsoletes: thunderbird-librnp-rnp < %{version}-%{release}
+%endif

 %description
 Mozilla Thunderbird is a standalone mail and newsgroup client.
@ -1514,6 +1517,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================

 %changelog
+* Mon May 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.11.0-1.alma.1
+- AlmaLinux changes
+
 * Mon May 13 2024 Eike Rathke <erack@redhat.com> - 115.11.0-1
 - Update to 115.11.0 build2

@ -1796,4 +1802,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Wed Jul 3 2019 Martin Stransky <stransky@redhat.com> - 60.7.2-3
 - Rebuild to fix rhbz#1725919 - Thunderbird fails to authenticate
  with gmail with ssl/tls and OAuth2.
-
Author	SHA1	Message	Date
eabdullin	5f5358e014	Merge branch 'c8' into a8	2024-05-20 10:08:20 +03:00
eabdullin	e5820d1a40	- Update 115.10.0.b2	2024-04-24 17:34:45 +03:00
eabdullin	95b3fb0d37	Merge pull request 'Add Obsoletes to thunderbird-librnp-rnp package' (#1 ) from a8-remove-plus into a8 Reviewed-on: #1	2024-04-22 14:50:38 +00:00
eabdullin	112168e2a4	Add Obsoletes to thunderbird-librnp-rnp package	2024-04-22 17:47:28 +03:00
Andrew Lukoshko	fa03567c91	Merge branch 'c8' into a8	2024-04-02 08:51:01 +00:00
eabdullin	6e3cb40c75	Merge branch 'c8' into a8	2024-02-27 20:26:44 +03:00
eabdullin	cf6a17a435	Merge branch 'c8' into a8	2024-01-31 10:09:17 +03:00
eabdullin	e26aaf089b	Merge branch 'c8' into a8	2024-01-04 10:30:08 +03:00
eabdullin	b22276289f	Merge branch 'c8' into a8	2023-11-29 12:46:23 +04:00
eabdullin	7381f37a2d	Merge branch 'c8' into a8	2023-11-02 11:55:10 +03:00
eabdullin	a09d59330f	Merge branch 'c8' into a8	2023-10-05 18:31:52 +03:00
eabdullin	6401601ae8	Merge branch 'c8' into a8	2023-09-20 12:06:28 +03:00
eabdullin	09cfae812e	Merge branch 'c8' into a8	2023-09-05 22:35:53 +03:00
eabdullin	799fdb58dc	Merge branch 'c8' into a8	2023-07-14 11:15:29 +03:00
eabdullin	391b0a0502	Merge branch 'c8' into a8	2023-05-18 06:16:10 +00:00
eabdullin	04471a5a94	Merge branch 'c8' into a8	2023-04-17 13:44:46 +00:00
eabdullin	0d18902bd6	Merge branch 'c8' into a8	2023-03-22 10:19:07 +00:00
eabdullin	69bed650cb	Merge branch 'c8' into a8	2023-02-20 11:54:55 +00:00
eabdullin	f8fa686d87	Merge branch 'c8' into a8	2023-02-07 09:39:54 +00:00
eabdullin	8dd47b353f	Merge branch 'c8' into a8	2023-01-25 15:10:06 +00:00
eabdullin	099aae8130	Merge branch 'c8' into a8	2022-12-15 15:46:24 +00:00
eabdullin	e4072b404c	Merge branch 'c8' into a8	2022-11-21 11:18:37 +00:00
eabdullin	36135359ad	Merge branch 'c8' into a8	2022-10-25 15:31:14 +00:00
eabdullin	ceb7317b05	Merge branch 'c8' into a8	2022-10-18 18:40:29 +00:00
Andrew Lukoshko	11bc7793c3	Merge branch 'c8' into a8	2022-09-26 20:50:03 +00:00
eabdullin	89a0fd84b6	Merge branch 'c8' into a8	2022-08-24 17:25:05 +00:00
eabdullin	82338a9b08	Merge branch 'c8' into a8	2022-08-01 08:58:38 +00:00
eabdullin	175f3993d6	Merge branch 'c8' into a8	2022-06-30 23:24:36 +00:00
eabdullin	790e38ac28	Added changelog line	2022-06-02 11:14:35 +03:00
eabdullin	fec3b15ca2	Merge branch 'c8' into a8	2022-06-02 07:51:17 +00:00
eabdullin	cb78322c6c	Merge branch 'c8' into a8	2022-05-26 11:05:42 +00:00
eabdullin	1aa5f0151b	Merge branch 'c8' into a8	2022-05-05 13:34:11 +00:00
eabdullin	feac4976db	Merge branch 'c8' into a8	2022-04-11 13:32:16 +00:00
eabdullin	387469dbb0	Merge branch 'c8' into a8	2022-03-14 13:44:10 +00:00
eabdullin	a6bd4d84fa	Merge branch 'c8' into a8	2022-02-15 10:05:59 +00:00
eabdullin	62b23618ff	Merge branch 'c8' into a8	2022-01-12 11:32:10 +00:00
eabdullin	66c23a0f50	Almalinux changes	2021-12-23 13:34:59 +03:00
eabdullin	b3f8354f54	AlmaLinux changes	2021-11-17 16:47:26 +03:00
Andrew Lukoshko	4d1f9f8163	Merge remote-tracking branch 'origin/c8' into a8	2021-10-21 15:41:10 +00:00
Andrew Lukoshko	f17f852148	AlmaLinux changes	2021-09-15 12:24:48 +00:00