import thunderbird-91.11.0-2.el9_0

SPECS/thunderbird.spec

@@ -133,22 +133,23 @@ end}
 #global buildnum .b2
 %global buildnum .b2
 
-Summary:              Mozilla Thunderbird mail/newsgroup client
-Name:                 thunderbird
-Version:              91.11.0
-Release:              2%{?dist}
-URL:                  http://www.mozilla.org/projects/thunderbird/
-License:              MPLv1.1 or GPLv2+ or LGPLv2+
-Group:                Applications/Internet
+%bcond_with rlplus
+Summary: Mozilla Thunderbird mail/newsgroup client
+Name: thunderbird
+Version: 91.11.0
+Release: 2%{?dist}%{?with_rlplus:.plus}
+URL: http://www.mozilla.org/projects/thunderbird/
+License: MPLv1.1 or GPLv2+ or LGPLv2+
+Group: Applications/Internet
 
 %if 0%{?rhel} == 9
-ExcludeArch:          %{ix86}
+ExcludeArch: %{ix86}
 %endif
 %if 0%{?rhel} == 8
-ExcludeArch:          %{ix86}
+ExcludeArch: %{ix86}
 %endif
 %if 0%{?rhel} == 7
-ExcludeArch:          s390 ppc
+ExcludeArch: s390 ppc
 %endif
 
 # We can't use the official tarball as it contains some test files that use
@@ -156,243 +157,245 @@ ExcludeArch:          s390 ppc
 # The official tarball has to be always processed by the process-official-tarball
 # script.
 # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz
-Source0:              thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
+Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
 %if %{build_langpacks}
-Source1:              thunderbird-langpacks-%{version}%{?ext_version}-20220628.tar.xz
+Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220628.tar.xz
 %endif
-Source2:              cbindgen-vendor.tar.xz
-Source3:              get-calendar-langpacks.sh
-Source4:              process-official-tarball
+Source2: cbindgen-vendor.tar.xz
+Source3: get-calendar-langpacks.sh
+Source4: process-official-tarball
 
-Source10:             thunderbird-mozconfig
-Source20:             thunderbird.desktop
-Source21:             thunderbird.sh.in
-Source24:             mozilla-api-key
-Source27:             google-api-key
-Source28:             node-stdout-nonblocking-wrapper
-Source701:            thunderbird-rocky-default-prefs.js
+Source10: thunderbird-mozconfig
+Source20: thunderbird.desktop
+Source21: thunderbird.sh.in
+Source24: mozilla-api-key
+Source27: google-api-key
+Source28: node-stdout-nonblocking-wrapper
+Source701: thunderbird-rocky-default-prefs.js
 
-Source403:            nss-3.67.0-7.el8_1.src.rpm
-Source401:            nss-setup-flags-env.inc
-Source402:            nspr-4.32.0-1.el8_1.src.rpm
+Source403: nss-3.67.0-7.el8_1.src.rpm
+Source401: nss-setup-flags-env.inc
+Source402: nspr-4.32.0-1.el8_1.src.rpm
 
 # Build patches
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
-Patch1001:            build-ppc64le-inline.patch
+Patch1001: build-ppc64le-inline.patch
 #Patch1003:      python-missing-utimensat.patch
-Patch1008:            build-rhel7-nasm-dwarf.patch
-Patch1009:            build-debuginfo-fix.patch
+Patch1008: build-rhel7-nasm-dwarf.patch
+Patch1009: build-debuginfo-fix.patch
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
-Patch4:               build-mozconfig-fix.patch
-Patch6:               build-nss-version.patch
+Patch4: build-mozconfig-fix.patch
+Patch6: build-nss-version.patch
 
 # Fedora/RHEL specific patches
-Patch215:             firefox-enable-addons.patch
-Patch219:             rhbz-1173156.patch
-Patch224:             mozilla-1170092.patch
-Patch237:             disable-openpgp-in-thunderbird.patch
+Patch215: firefox-enable-addons.patch
+Patch219: rhbz-1173156.patch
+Patch224: mozilla-1170092.patch
+%if %{without rlplus}
+Patch237: disable-openpgp-in-thunderbird.patch
+%endif
 
 # Upstream patches
 
-Patch503:             mozilla-s390-context.patch
-Patch505:             mozilla-bmo1005535.patch
-Patch506:             mozilla-bmo1504834-part1.patch
-Patch507:             mozilla-bmo1504834-part2.patch
-Patch508:             mozilla-bmo1504834-part3.patch
-Patch509:             mozilla-bmo1504834-part4.patch
-Patch510:             mozilla-bmo1554971.patch
-Patch511:             mozilla-bmo1602730.patch
-Patch512:             mozilla-bmo849632.patch
-Patch513:             mozilla-bmo998749.patch
-Patch514:             mozilla-s390x-skia-gradient.patch
-Patch515:             mozilla-bmo1626236.patch
-Patch516:             expat-CVE-2022-25235.patch
-Patch517:             expat-CVE-2022-25236.patch
-Patch518:             expat-CVE-2022-25315.patch
+Patch503: mozilla-s390-context.patch
+Patch505: mozilla-bmo1005535.patch
+Patch506: mozilla-bmo1504834-part1.patch
+Patch507: mozilla-bmo1504834-part2.patch
+Patch508: mozilla-bmo1504834-part3.patch
+Patch509: mozilla-bmo1504834-part4.patch
+Patch510: mozilla-bmo1554971.patch
+Patch511: mozilla-bmo1602730.patch
+Patch512: mozilla-bmo849632.patch
+Patch513: mozilla-bmo998749.patch
+Patch514: mozilla-s390x-skia-gradient.patch
+Patch515: mozilla-bmo1626236.patch
+Patch516: expat-CVE-2022-25235.patch
+Patch517: expat-CVE-2022-25236.patch
+Patch518: expat-CVE-2022-25315.patch
 
 %if %{?system_nss}
 %if !0%{?bundle_nss}
-BuildRequires:        pkgconfig(nspr) >= %{nspr_version}
-BuildRequires:        pkgconfig(nss) >= %{nss_version}
-BuildRequires:        nss-static >= %{nss_version}
-%endif
-%endif
-BuildRequires:        pkgconfig(libpng)
-BuildRequires:        xz
-BuildRequires:        libXt-devel
-BuildRequires:        mesa-libGL-devel
-Requires:             liberation-fonts-common
-Requires:             liberation-sans-fonts
-BuildRequires:        libjpeg-devel
-BuildRequires:        zip
-BuildRequires:        bzip2-devel
-BuildRequires:        pkgconfig(zlib)
-BuildRequires:        pkgconfig(gtk+-2.0)
-BuildRequires:        krb5-devel
-BuildRequires:        pkgconfig(pango)
-BuildRequires:        pkgconfig(freetype2) >= 2.1.9
-BuildRequires:        pkgconfig(xt)
-BuildRequires:        pkgconfig(xrender)
+BuildRequires: pkgconfig(nspr) >= %{nspr_version}
+BuildRequires: pkgconfig(nss) >= %{nss_version}
+BuildRequires: nss-static >= %{nss_version}
+%endif
+%endif
+BuildRequires: pkgconfig(libpng)
+BuildRequires: xz
+BuildRequires: libXt-devel
+BuildRequires: mesa-libGL-devel
+Requires: liberation-fonts-common
+Requires: liberation-sans-fonts
+BuildRequires: libjpeg-devel
+BuildRequires: zip
+BuildRequires: bzip2-devel
+BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: krb5-devel
+BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(freetype2) >= 2.1.9
+BuildRequires: pkgconfig(xt)
+BuildRequires: pkgconfig(xrender)
 %if %{?system_hunspell}
-BuildRequires:        hunspell-devel
+BuildRequires: hunspell-devel
 %endif
-BuildRequires:        pkgconfig(libstartup-notification-1.0)
-BuildRequires:        pkgconfig(libnotify)
-BuildRequires:        pkgconfig(dri)
-BuildRequires:        pkgconfig(libcurl)
-BuildRequires:        dbus-glib-devel
-BuildRequires:        m4
+BuildRequires: pkgconfig(libstartup-notification-1.0)
+BuildRequires: pkgconfig(libnotify)
+BuildRequires: pkgconfig(dri)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: dbus-glib-devel
+BuildRequires: m4
 
-BuildRequires:        pkgconfig(libpulse)
+BuildRequires: pkgconfig(libpulse)
 
 %if 0%{?use_dts}
-BuildRequires:        devtoolset-%{dts_version}-gcc-c++
-BuildRequires:        devtoolset-%{dts_version}-gcc
-BuildRequires:        devtoolset-%{dts_version}-libatomic-devel
+BuildRequires: devtoolset-%{dts_version}-gcc-c++
+BuildRequires: devtoolset-%{dts_version}-gcc
+BuildRequires: devtoolset-%{dts_version}-libatomic-devel
 %endif
 %if 0%{?rhel} == 9
-BuildRequires:        gcc
-BuildRequires:        gcc-c++
-BuildRequires:        cargo
-BuildRequires:        rust
-BuildRequires:        clang clang-libs llvm
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: cargo
+BuildRequires: rust
+BuildRequires: clang clang-libs llvm
 %endif
 
-BuildRequires:        scl-utils
-BuildRequires:        findutils
+BuildRequires: scl-utils
+BuildRequires: findutils
 
-BuildRequires:        %{nodejs_rb} >= 10.21
-BuildRequires:        python3
+BuildRequires: %{nodejs_rb} >= 10.21
+BuildRequires: python3
 
 %if 0%{?rhel} == 8
-BuildRequires:        cargo
-BuildRequires:        rust >= %{rust_version}
-BuildRequires:        llvm >= %{llvm_version}
-BuildRequires:        llvm-devel >= %{llvm_version}
-BuildRequires:        clang >= %{llvm_version}
-BuildRequires:        clang-devel >= %{llvm_version}
-BuildRequires:        rustfmt >= %{rust_version}
+BuildRequires: cargo
+BuildRequires: rust >= %{rust_version}
+BuildRequires: llvm >= %{llvm_version}
+BuildRequires: llvm-devel >= %{llvm_version}
+BuildRequires: clang >= %{llvm_version}
+BuildRequires: clang-devel >= %{llvm_version}
+BuildRequires: rustfmt >= %{rust_version}
 %else
 %if 0%{?use_rustts}
-BuildRequires:        rust-toolset-%{rust_version}
+BuildRequires: rust-toolset-%{rust_version}
 %endif
 %if 0%{?use_llvmts}
-BuildRequires:        llvm-toolset-%{llvm_version}
-BuildRequires:        llvm-toolset-%{llvm_version}-llvm-devel
-BuildRequires:        llvm-toolset-%{llvm_version}-clang
-BuildRequires:        llvm-toolset-%{llvm_version}-clang-devel
+BuildRequires: llvm-toolset-%{llvm_version}
+BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel
+BuildRequires: llvm-toolset-%{llvm_version}-clang
+BuildRequires: llvm-toolset-%{llvm_version}-clang-devel
 %endif
 %endif
 
-BuildRequires:        nasm
+BuildRequires: nasm
 %if %{build_with_clang}
-BuildRequires:        lld
+BuildRequires: lld
 %endif
 
 %if 0%{?rhel} == 8
   %if %{rhel_minor_version} >= 3
-BuildRequires:        pkgconfig(libpipewire-0.3)
+BuildRequires: pkgconfig(libpipewire-0.3)
   %else
-BuildRequires:        pipewire-devel
+BuildRequires: pipewire-devel
   %endif
 %endif
 
-BuildRequires:        gtk3-devel
-BuildRequires:        glib2-devel
-BuildRequires:        perl-interpreter
+BuildRequires: gtk3-devel
+BuildRequires: glib2-devel
+BuildRequires: perl-interpreter
 
 # Bundled nss/nspr requirement
 %if 0%{?bundle_nss}
-BuildRequires:        nss-softokn
-BuildRequires:        sqlite-devel
-BuildRequires:        zlib-devel
-BuildRequires:        pkgconfig
-BuildRequires:        gawk
-BuildRequires:        psmisc
-BuildRequires:        gcc-c++
-BuildRequires:        xmlto
+BuildRequires: nss-softokn
+BuildRequires: sqlite-devel
+BuildRequires: zlib-devel
+BuildRequires: pkgconfig
+BuildRequires: gawk
+BuildRequires: psmisc
+BuildRequires: gcc-c++
+BuildRequires: xmlto
 %endif
 
 
-Requires:             mozilla-filesystem
-Requires:             p11-kit-trust
+Requires: mozilla-filesystem
+Requires: p11-kit-trust
 %if %{?system_nss}
 %if !0%{?bundle_nss}
-Requires:             nspr >= %{nspr_build_version}
-Requires:             nss >= %{nss_build_version}
+Requires: nspr >= %{nspr_build_version}
+Requires: nss >= %{nss_build_version}
 %endif
 %endif
 
-BuildRequires:        desktop-file-utils
-BuildRequires:        system-bookmarks
-Requires:             redhat-indexhtml
+BuildRequires: desktop-file-utils
+BuildRequires: system-bookmarks
+Requires: redhat-indexhtml
 
 %if %{?run_tests}
-BuildRequires:        xorg-x11-server-Xvfb
+BuildRequires: xorg-x11-server-Xvfb
 %endif
 
-BuildRequires:        pkgconfig(libffi)
+BuildRequires: pkgconfig(libffi)
 
 %if 0%{?big_endian}
   %if 0%{?flatpak}
-BuildRequires:        icu
+BuildRequires: icu
   %endif
 %endif
 
-Obsoletes:            thunderbird-lightning
+Obsoletes: thunderbird-lightning
 # ==================================================================================
 
 # Bundled libraries
-Provides:             bundled(angle)
-Provides:             bundled(cairo)
-Provides:             bundled(graphite2)
-Provides:             bundled(harfbuzz)
-Provides:             bundled(ots)
-Provides:             bundled(sfntly)
-Provides:             bundled(skia)
-Provides:             bundled(thebes)
-Provides:             bundled(WebRender)
-Provides:             bundled(audioipc-2)
-Provides:             bundled(ffvpx)
-Provides:             bundled(kissfft)
-Provides:             bundled(libaom)
-Provides:             bundled(libcubeb)
-Provides:             bundled(libdav1d)
-Provides:             bundled(libjpeg)
-Provides:             bundled(libmkv)
-Provides:             bundled(libnestegg)
-Provides:             bundled(libogg)
-Provides:             bundled(libopus)
-Provides:             bundled(libpng)
-Provides:             bundled(libsoundtouch)
-Provides:             bundled(libspeex_resampler)
-Provides:             bundled(libtheora)
-Provides:             bundled(libtremor)
-Provides:             bundled(libvorbis)
-Provides:             bundled(libvpx)
-Provides:             bundled(libwebp)
-Provides:             bundled(libyuv)
-Provides:             bundled(mp4parse-rust)
-Provides:             bundled(mtransport)
-Provides:             bundled(openmax_dl)
-Provides:             bundled(double-conversion)
-Provides:             bundled(brotli)
-Provides:             bundled(fdlibm)
-Provides:             bundled(freetype2)
-Provides:             bundled(libmar)
-Provides:             bundled(woff2)
-Provides:             bundled(xz-embedded)
-Provides:             bundled(zlib)
-Provides:             bundled(expat)
-Provides:             bundled(msgpack-c)
-Provides:             bundled(libprio)
-Provides:             bundled(rlbox_sandboxing_api)
-Provides:             bundled(sqlite3)
+Provides: bundled(angle)
+Provides: bundled(cairo)
+Provides: bundled(graphite2)
+Provides: bundled(harfbuzz)
+Provides: bundled(ots)
+Provides: bundled(sfntly)
+Provides: bundled(skia)
+Provides: bundled(thebes)
+Provides: bundled(WebRender)
+Provides: bundled(audioipc-2)
+Provides: bundled(ffvpx)
+Provides: bundled(kissfft)
+Provides: bundled(libaom)
+Provides: bundled(libcubeb)
+Provides: bundled(libdav1d)
+Provides: bundled(libjpeg)
+Provides: bundled(libmkv)
+Provides: bundled(libnestegg)
+Provides: bundled(libogg)
+Provides: bundled(libopus)
+Provides: bundled(libpng)
+Provides: bundled(libsoundtouch)
+Provides: bundled(libspeex_resampler)
+Provides: bundled(libtheora)
+Provides: bundled(libtremor)
+Provides: bundled(libvorbis)
+Provides: bundled(libvpx)
+Provides: bundled(libwebp)
+Provides: bundled(libyuv)
+Provides: bundled(mp4parse-rust)
+Provides: bundled(mtransport)
+Provides: bundled(openmax_dl)
+Provides: bundled(double-conversion)
+Provides: bundled(brotli)
+Provides: bundled(fdlibm)
+Provides: bundled(freetype2)
+Provides: bundled(libmar)
+Provides: bundled(woff2)
+Provides: bundled(xz-embedded)
+Provides: bundled(zlib)
+Provides: bundled(expat)
+Provides: bundled(msgpack-c)
+Provides: bundled(libprio)
+Provides: bundled(rlbox_sandboxing_api)
+Provides: bundled(sqlite3)
 
 #TB third party libs
-Provides:             bundled(libgcrypt)
-Provides:             bundled(libgpg-error)
-Provides:             bundled(libotr)
+Provides: bundled(libgcrypt)
+Provides: bundled(libgpg-error)
+Provides: bundled(libotr)
 
 # In case we enable MOZ_OPENPGP add following:
 #Provides: bundled(botan)
@@ -401,8 +404,8 @@ Provides:             bundled(libotr)
 #Provides: bundled(rnp)
 
 %if 0%{?bundle_nss}
-Provides:             bundled(nss) = 3.67.0
-Provides:             bundled(nspr) = 4.32.0
+Provides: bundled(nss) = 3.67.0
+Provides: bundled(nspr) = 4.32.0
 %endif
 %description
 Mozilla Thunderbird is a standalone mail and newsgroup client.
@@ -449,7 +452,9 @@ echo "use_rustts            %{?use_rustts}"
 %patch516 -p1 -b .expat-CVE-2022-25235
 %patch517 -p1 -b .expat-CVE-2022-25236
 %patch518 -p1 -b .expat-CVE-2022-25315
+%if %{without rlplus}
 %patch237 -p1 -b .disable-openpgp-in-thunderbird
+%endif
 
 
 %patch1001 -p1 -b .ppc64le-inline
@@ -1028,7 +1033,9 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-*
 
 
 # Removing librnp.so - we cannot deliver that in RHELs
+%if %{without rlplus}
 %{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
+%endif
 
 # Register as an application to be visible in the software center
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
@@ -1115,7 +1122,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Mon Jul 11 2022 Release Engineering <releng@rockylinux.org> - 91.11.0-2
+* Mon Jul 11 2022 Release Engineering <releng@rockylinux.org> - 91.11.0-2%{?with_rlplus:.plus}
 - Add Rocky Linux debranding
 - Add rlplus conditional