import thunderbird-102.3.0-3.el9_0

SPECS/thunderbird.spec

@@ -224,7 +224,9 @@ Patch224: mozilla-1170092.patch
 Patch226: rhbz-1354671.patch
 Patch228: disable-openh264-download.patch
 Patch229: firefox-nss-addon-hack.patch
+%if %{without rlplus}
 Patch230: disable-openpgp-in-thunderbird.patch
+%endif
 Patch231: cbindgen-already-covers.patch
 
 # Upstream patches
@@ -566,7 +568,9 @@ echo "use_rustts            %{?use_rustts}"
 %endif
 %patch228 -p1 -b .disable-openh264-download
 %patch229 -p1 -b .firefox-nss-addon-hack
+%if %{without rlplus}
 %patch230 -p1 -b .disable-openpgp-in-thunderbird
+%endif
 %patch231 -p1 -b .cbindgen-already-covers
 
 %patch415 -p1 -b .1670333
@@ -1101,8 +1105,8 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
 # Removing librnp.so - we cannot deliver that in RHELs
 %if %{without rlplus}
-%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
-%endif %{buildroot}%{mozappdir}/rnp-cli %{buildroot}%{mozappdir}/rnpkeys
+%{__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
 %{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml