import CS8 thunderbird-102.13.0-2.el8

.gitignore

@@ -1,6 +1,5 @@
 SOURCES/cbindgen-vendor.tar.xz
 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
 SOURCES/nss-3.79.0-11.el8_1.src.rpm
-SOURCES/thunderbird-102.11.0.processed-source.tar.xz
+SOURCES/thunderbird-102.13.0.b2.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-102.11.0-20230504.tar.xz
+SOURCES/thunderbird-langpacks-102.13.0-20230707.tar.xz
-SOURCES/thunderbird-symbolic.svg

.thunderbird.metadata

@@ -1,6 +1,5 @@
 2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz
 af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
 a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm
-7ffefde4550bd8ad0557ec011e9bd921d145ae3d SOURCES/thunderbird-102.11.0.processed-source.tar.xz
+7d2ee2fbb3f527e7062e32a1f13b06177c8a3cf3 SOURCES/thunderbird-102.13.0.b2.processed-source.tar.xz
-c030353a3e2d3e1d060d44b7e316c89672742ee6 SOURCES/thunderbird-langpacks-102.11.0-20230504.tar.xz
+cdf9e5ddff298c2b5690456a66c3868a44a382b3 SOURCES/thunderbird-langpacks-102.13.0-20230707.tar.xz
-42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg

SOURCES/thunderbird-mozconfig

@@ -17,6 +17,7 @@ ac_add_options --with-system-jpeg
 ac_add_options --enable-js-shell
 ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --without-sysroot
+ac_add_options --update-channel=release
 # investigate this one:
 ac_add_options --without-wasm-sandboxed-libraries
 ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key

SOURCES/thunderbird-symbolic.svg

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg826"
+   inkscape:version="0.92+devel unknown"
+   sodipodi:docname="thunderbird-symbolic.svg">
+  <defs
+     id="defs820" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#555753"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="14.909311"
+     inkscape:cy="6.5299379"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1136"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true" />
+  <metadata
+     id="metadata823">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76664)">
+    <path
+       style="fill:#bebebe;fill-opacity:1;stroke-width:0.50472808;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:1.00945637, 3.02836921000000014"
+       d="M 6.2871094 0.6796875 C 5.4163558 0.91578892 4.8510898 1.5936957 4.5292969 2.1464844 C 2.421315 3.2450921 0.99225272 5.3610823 0.9921875 7.7949219 C 0.99477587 10.359489 2.3110205 12.446765 4.71875 13.445312 C 3.4595645 12.812546 2.2935825 11.525048 1.9707031 10.179688 C 1.7935937 9.4417327 1.7111632 8.3804473 1.7871094 7.8671875 C 2.0153769 8.1799434 2.3679623 8.3686337 2.6191406 8.3535156 C 2.4938628 8.2316259 2.1405878 7.2674351 2.2246094 6.7109375 C 2.3603578 5.8118257 3.1848776 4.5727304 3.6171875 4.3652344 C 3.5950724 4.1994643 3.6227354 4.5729785 3.6347656 4.6757812 C 3.6727178 5.0001403 3.7890738 5.2722323 3.7246094 5.5625 C 3.6729882 5.7950165 3.4515893 6.0294455 3.4980469 6.4824219 C 3.5108599 6.6073731 3.6284702 6.8445848 3.7539062 6.9277344 C 3.7535036 6.9231566 3.7580261 6.9016692 3.7578125 6.8964844 C 4.1688563 6.4878098 4.2988638 6.3923311 4.8164062 6.1835938 C 5.3947783 5.9504725 5.7292796 5.4840924 6.5429688 5.3242188 C 7.1567719 5.2036518 7.7980995 5.4618768 8.4160156 5.4316406 C 8.9595412 5.4051839 9.6230469 5.3164062 9.6230469 5.3164062 C 9.6230469 5.3164062 10.529591 6.3734458 10.554688 8.0839844 C 10.561372 8.5399466 10.393117 9.2581935 10.080078 9.6074219 C 10.10866 9.6301636 10.842076 9.8181331 11.496094 8.9296875 L 11.496094 8.9277344 C 11.500502 8.9217421 11.509138 8.9123452 11.513672 8.90625 C 11.511804 8.9162203 11.509634 8.919117 11.507812 8.9296875 C 11.082979 11.395346 10.343305 12.786026 9.3730469 13.716797 L 9.3652344 13.716797 C 9.1593686 13.914136 8.9415569 14.089651 8.7167969 14.253906 C 8.6515695 14.300524 8.584386 14.344389 8.5175781 14.388672 C 8.3185959 14.523496 8.1179918 14.6549 7.9042969 14.771484 C 7.453226 15.017472 9.0852392 14.946167 10.126953 14.476562 C 10.157938 14.470814 10.189917 14.46715 10.220703 14.460938 C 9.8033537 14.744465 9.3535156 15 9.3535156 15 C 9.3535156 15 10.890634 14.899538 11.974609 13.804688 C 11.975453 13.803262 11.975783 13.800425 11.976562 13.798828 C 13.818222 12.736706 15.007176 10.687802 15.007812 8.21875 C 15.005272 5.4392694 13.347542 2.9608845 10.865234 2.0253906 C 9.9215437 1.5797455 8.881353 1.3464382 7.8261719 1.34375 C 7.5325222 1.3437527 7.2448312 1.3664635 6.9609375 1.4003906 C 6.9469035 1.339967 6.9417802 1.323023 6.9726562 1.203125 C 6.8504944 1.2378967 6.8589251 1.2466706 6.7519531 1.2988281 C 6.7527631 1.1850643 6.7593232 1.2159555 6.7519531 1.0976562 C 6.5269885 1.1694673 6.5079647 1.1993654 6.3398438 1.3085938 C 6.3964573 1.0867355 6.399826 1.1278526 6.5527344 0.88671875 C 6.3493259 0.94186206 6.0726487 1.1030774 5.7460938 1.4511719 C 5.8509855 1.1114301 5.9907037 1.0292938 6.2871094 0.6796875 z "
+       transform="matrix(0.26458333,0,0,0.26458333,0,292.76664)"
+       id="path24330" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26511249;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;opacity:1"
+       d="M 0.81054688 293.97852 L 0.59179688 294.12695 L 1.4453125 295.40234 L 2.9335938 294.85156 L 2.8417969 294.60352 L 1.5507812 295.08008 L 0.81054688 293.97852 z "
+       id="path24387" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 1.7871094,9.8730469 0.1210937,0.5820311 -0.1230469,-0.02344 c 0,0 0.2754046,0.874485 0.8561662,1.437975 0.5080908,0.49319 0.9335266,1.121624 2.1243026,1.601087 C 4.3317049,12.663641 4.1812012,12.346136 3.9980469,11.6875 l 0.2128906,0.07031 C 4.5424397,12.049861 4.8536251,12.30456 5.5800781,12.4375 5.4786992,12.266213 5.448324,12.238135 5.3847656,12.142578 l 4.7363284,1.554688 0.316406,-0.945313 z"
+       transform="matrix(0.26458333,0,0,0.26458333,0,292.76664)"
+       id="path24379"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccc" />
+  </g>
+</svg>

SPECS/thunderbird.spec

@@ -8,7 +8,7 @@
 %endif
 
 %{lua:
-function dist_to_rhel_minor(str, start)
+function dist_to_rhel8_minor(str, start)
   match = string.match(str, ".module%+el8.%d+")
   if match then
      return string.sub(match, 13)
@@ -24,7 +24,25 @@ function dist_to_rhel_minor(str, start)
   return -1
 end}
 
-%global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))}
+%{lua:
+function dist_to_rhel9_minor(str, start)
+  match = string.match(str, ".module%+el9.%d+")
+  if match then
+     return string.sub(match, 13)
+  end
+  match = string.match(str, ".el9_%d+")
+  if match then
+     return string.sub(match, 6)
+  end
+  match = string.match(str, ".el9")
+  if match then
+     return 3
+  end
+  return -1
+end}
+
+%global rhel8_minor_version %{lua:print(dist_to_rhel8_minor(rpm.expand("%dist")))}
+%global rhel9_minor_version %{lua:print(dist_to_rhel9_minor(rpm.expand("%dist")))}
 
 # Produce debug (non-optimized) package build. Suitable for debugging only
 # as the build is *very* slow.
@@ -37,12 +55,12 @@ end}
 # librnp with openssl support, not available in RHEL7 because it requires openssl >= 1.1.1e,
 # nor in rhel-8.1.0 or rhel-8.2.0
 %global use_openssl_for_librnp 1
-%if 0%{?rhel} == 7 || (0%{?rhel} == 8 && %{rhel_minor_version} < 4)
+%if 0%{?rhel} == 7 || (0%{?rhel} == 8 && %{rhel8_minor_version} < 4)
 %global use_openssl_for_librnp 0
 %endif
 
 %if 0%{?rhel} == 8
-  %if %{rhel_minor_version} <= 4
+  %if %{rhel8_minor_version} <= 4
     %global bundle_nss        1
     %global system_nss        1
   %endif
@@ -165,8 +183,8 @@ end}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        102.11.0
+Version:        102.13.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -174,13 +192,13 @@ License:        MPLv1.1 or GPLv2+ or LGPLv2+
 # 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
 
 %if 0%{?rhel} == 9
 ExcludeArch:    %{ix86}
 %endif
 %if 0%{?rhel} == 8
-  %if %{rhel_minor_version} == 1
+  %if %{rhel8_minor_version} == 1
 ExcludeArch:    %{ix86} aarch64 s390x
   %else
 ExcludeArch:    %{ix86}
@@ -193,7 +211,7 @@ ExcludeArch:    aarch64 s390 ppc
 #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 %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20230504.tar.xz
+Source1:        thunderbird-langpacks-%{version}-20230707.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -458,7 +476,7 @@ BuildRequires:  pciutils-libs
 
 Obsoletes:      mozilla <= 37:1.7.13
 Provides:       webclient
-%if 0%{?rhel} == 8 && %{rhel_minor_version} < 6
+%if 0%{?rhel} == 8 && %{rhel8_minor_version} < 6
 %ifarch aarch64
 BuildRequires: gcc-toolset-12-annobin-plugin-gcc
 %endif
@@ -560,7 +578,8 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 %prep
 echo "Build environment"
 echo "dist                  %{?dist}"
-echo "RHEL 8 minor version: %{?rhel_minor_version}"
+echo "RHEL 8 minor version: %{?rhel8_minor_version}"
+echo "RHEL 9 minor version: %{?rhel9_minor_version}"
 echo "use_bundled_ffi       %{?use_bundled_ffi}"
 echo "bundle_nss            %{?bundle_nss}"
 echo "system_nss            %{?system_nss}"
@@ -591,7 +610,8 @@ echo "use_rustts            %{?use_rustts}"
 %patch77 -p1 -b .mozilla-1775202
 
 %patch73 -p1 -b .build-ascii-decode-fail-rhel7
-%if 0%{?rhel} == 7
+%if 0%{?rhel} == 7 || (0%{?rhel} == 8 && %{rhel8_minor_version} >= 9)
+# Also c8s/rhel-8.9.0 has only node 10.24.0, this is build-only.
 %patch78 -p1 -b .build-rhel7-lower-node-min-version
 %endif
 
@@ -729,7 +749,7 @@ echo "ac_add_options --with-librnp-backend=openssl" >> .mozconfig
 %endif
 
 # AV1 requires newer nasm that was rebased in 8.4
-%if 0%{?rhel} == 7 || (0%{?rhel} == 8 && %{rhel_minor_version} < 4)
+%if 0%{?rhel} == 7 || (0%{?rhel} == 8 && %{rhel8_minor_version} < 4)
 echo "ac_add_options --disable-av1" >> .mozconfig
 %endif
 
@@ -821,7 +841,7 @@ function install_rpms_to_current_dir() {
 %endif
 
 set +e
-%if 0%{?rhel} == 8 && %{rhel_minor_version} < 6
+%if 0%{?rhel} == 8 && %{rhel8_minor_version} < 6
 %ifarch aarch64
 source scl_source enable gcc-toolset-12
 %endif
@@ -1255,6 +1275,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* 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
+
+* Mon Jun 05 2023 Eike Rathke <erack@redhat.com> - 102.12.0-1
+- Update to 102.12.0 build1
+
 * Thu May 04 2023 Eike Rathke <erack@redhat.com> - 102.11.0-1
 - Update to 102.11.0 build1