From 42f45fcc504fbdea8608f65e09c70fa4b49c085b Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Apr 23 2024 11:26:04 +0000
Subject: Move the MOZ_APP_REMOTINGNAME from the startup script to to the build option.


It actually breaks openning links in Firefox because the wrong remoting
name is used to activate Firefox app.

---

diff --git a/thunderbird.sh.in b/thunderbird.sh.in
index db5e171..3299b30 100644
--- a/thunderbird.sh.in
+++ b/thunderbird.sh.in
@@ -83,12 +83,6 @@ fi
 
 __WAYLAND_X11_PLACEHOLDER__
 
-# We need to link Firefox with desktop file name
-if [ -z "$MOZ_APP_REMOTINGNAME" ]
-then
-  export MOZ_APP_REMOTINGNAME=__APP_NAME__
-fi
-
 ##
 ## Automatically installed langpacks are tracked by .fedora-langpack-install
 ## config file.
diff --git a/thunderbird.spec b/thunderbird.spec
index d34c73b..c0597e1 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -77,7 +77,7 @@ ExcludeArch: s390x
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        115.10.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPL-2.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later
 Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
@@ -388,6 +388,12 @@ echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig
 
 echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
 
+%if 0%{?fedora} >= 40
+echo 'export MOZ_APP_REMOTINGNAME=org.mozilla.thunderbird' >> .mozconfig
+%else
+echo 'export MOZ_APP_REMOTINGNAME=thunderbird' >> .mozconfig
+%endif
+
 # Remove executable bit to make brp-mangle-shebangs happy.
 find third_party -type f  -iname "*.rs"|xargs chmod a-x
 
@@ -581,10 +587,8 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 # Enable wayland by default on f40+
 %if 0%{?fedora} >= 40
 sed -i -e 's,__WAYLAND_X11_PLACEHOLDER__,export MOZ_ENABLE_WAYLAND=1,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird 
-sed -i -e 's,__APP_NAME__,org.mozilla.thunderbird,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 %else
 sed -i -e 's,__WAYLAND_X11_PLACEHOLDER__,,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird 
-sed -i -e 's,__APP_NAME__,thunderbird,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 %{__cat} %{SOURCE28} | %{__sed} -e 's,__PREFIX__,%{_prefix},g' > \
         %{buildroot}%{_bindir}/thunderbird-wayland
 %{__chmod} 755 %{buildroot}%{_bindir}/thunderbird-wayland
@@ -736,6 +740,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Apr 23 2024 Jan Horak <jhorak@redhat.com> - 115.10.1-4
+- Move the MOZ_APP_REMOTINGNAME from the startup script to the build options.
+
 * Tue Apr 23 2024 Jan Horak <jhorak@redhat.com> - 115.10.1-3
 - Fixed startup script