Merge branch 'c8' into a8

2024-01-04 10:30:08 +03:00 · 2023-11-29 12:46:23 +04:00 · 2023-11-02 11:55:10 +03:00 · 2023-10-05 18:31:52 +03:00 · 2023-09-20 12:06:28 +03:00 · 2023-09-05 22:35:53 +03:00
5 changed files with 18 additions and 53 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz
 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
 SOURCES/nss-3.90.0-2.el8_1.src.rpm
 SOURCES/nss-3.90.0-3.el9_0.src.rpm
-SOURCES/thunderbird-115.12.1.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-115.12.1-20240618.tar.xz
+SOURCES/thunderbird-115.6.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-115.6.0-20231218.tar.xz
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@ -2,5 +2,5 @@ b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
 d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
 39d1004f8948186cdaa33bbb90423f6f994bdf6c SOURCES/nss-3.90.0-2.el8_1.src.rpm
 df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm
-8485420cd9241904b23a376870d12d7fe4cd0eb3 SOURCES/thunderbird-115.12.1.processed-source.tar.xz
-94b02d8fc382e44dfb48d52bc5db1a6bc8497050 SOURCES/thunderbird-langpacks-115.12.1-20240618.tar.xz
+9bae1ff495719abed7db2d12735431aad655e436 SOURCES/thunderbird-115.6.0.processed-source.tar.xz
+42ee128db6384decdc7980c22e2df8792868ca7d SOURCES/thunderbird-langpacks-115.6.0-20231218.tar.xz
--- a/SOURCES/build-rhel7-lower-node-min-version.patch
+++ b/SOURCES/build-rhel7-lower-node-min-version.patch
@ -1,11 +1,11 @@
--- firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version	2024-02-12 21:53:56.000000000 +0200
-+++ firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py	2024-02-14 16:48:12.476182627 +0200
+--- firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version	2022-10-10 17:55:56.000000000 +0200
+++ firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py	2022-10-17 14:57:47.476182627 +0200
@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
- from packaging.version import Version
+ from mozfile import which
 from six import PY3
 
-NODE_MIN_VERSION = Version("12.22.12")
-+NODE_MIN_VERSION = Version("10.24.0")
- NPM_MIN_VERSION = Version("6.14.16")
+-NODE_MIN_VERSION = StrictVersion("12.22.12")
+NODE_MIN_VERSION = StrictVersion("10.24.0")
+ NPM_MIN_VERSION = StrictVersion("6.14.16")
 
 
--- 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
@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
  end
  match = string.match(str, ".el9")
  if match then
-     return 5
+     return 4
  end
  return -1
 end}
@ -124,7 +124,7 @@ end}
 # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
 # thunderbird-102.8.0.b2.processed-source.tar.xz
 # When unset use processed source file name as is.
-##global buildnum .b2
+##global buildnum             .b2

 %bcond_without langpacks

@ -134,8 +134,8 @@ end}

 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        115.12.1
-Release:        1%{?dist}
+Version:        115.6.0
+Release:        1%{?dist}.alma
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+

@ -165,7 +165,7 @@ ExcludeArch:    aarch64 s390 ppc ppc64
 #Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz
 Source0:        thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
 %if %{with langpacks}
-Source1:        thunderbird-langpacks-%{version}-20240618.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20231218.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@ -1514,34 +1514,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================

 %changelog
-* Tue Jun 18 2024 Eike Rathke <erack@redhat.com> - 115.12.1-1
- Update to 115.12.1 build1
-
-* Tue Jun 11 2024 Eike Rathke <erack@redhat.com> - 115.12.0-2
- Update to 115.12.0 build2
-
-* Mon Jun 10 2024 Eike Rathke <erack@redhat.com> - 115.12.0-1
- Update to 115.12.0 build1
-
-* Mon May 13 2024 Eike Rathke <erack@redhat.com> - 115.11.0-1
- Update to 115.11.0 build2
-
-* Mon Apr 15 2024 Eike Rathke <erack@redhat.com> - 115.10.0-2
- Update to 115.10.0 build2
-
-* Fri Apr 12 2024 Eike Rathke <erack@redhat.com> - 115.10.0-1
- Update to 115.10.0 build1
- Revert expat CVE-2023-52425 fix
-
-* Mon Mar 18 2024 Eike Rathke <erack@redhat.com> - 115.9.0-1
- Update to 115.9.0 build1
- Fix expat CVE-2023-52425
-
-* Mon Feb 19 2024 Eike Rathke <erack@redhat.com> - 115.8.0-1
- Update to 115.8.0 build1
-
-* Mon Jan 22 2024 Eike Rathke <erack@redhat.com> - 115.7.0-1
- Update to 115.7.0 build1
+* Thu Jan 04 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.6.0-1.alma
+- Debrand for AlmaLinux

 * Mon Dec 18 2023 Eike Rathke <erack@redhat.com> - 115.6.0-1
 - Update to 115.6.0 build2
@ -1572,7 +1546,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

@ -1581,25 +1554,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

@ -1608,16 +1576,13 @@ 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
-
 * Fri Sep 16 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-3
 - Update to 102.3.0 build1
Author	SHA1	Message	Date
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