tor-browser

commit a8567fd2be7c424b2dc5efe1f0c9938afb3af385
parent 08bc746051fd58bc0670023904de907b122a9b3c
Author: Bastien Orivel <borivel@mozilla.com>
Date:   Tue, 11 Nov 2025 10:00:40 +0000

Bug 1998420 - Add a distribution.ini to the RPM package. r=releng-reviewers,jcristau

This is required mostly to be able to set `intl.locale.requested=""`
which finally allows langpacks to work seamlessly when installed but
also to get the distribution id correct (see bug 1811104 for the debian
equivalent to that).

Differential Revision: https://phabricator.services.mozilla.com/D271402

Diffstat:
A
browser/installer/linux/app/rpm/distribution.ini
 | 
7
+++++++
M
browser/installer/linux/app/rpm/firefox.spec.j2
 | 
1
+
M
python/mozbuild/mozbuild/repackaging/rpm.py
 | 
2
+-

3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/browser/installer/linux/app/rpm/distribution.ini b/browser/installer/linux/app/rpm/distribution.ini
@@ -0,0 +1,7 @@
+[Global]
+id=mozilla-rpm
+version=1.0
+about=Mozilla Firefox RPM Package
+
+[Preferences]
+intl.locale.requested=""
diff --git a/browser/installer/linux/app/rpm/firefox.spec.j2 b/browser/installer/linux/app/rpm/firefox.spec.j2
@@ -27,6 +27,7 @@ Source{{ loop.index + 2 }}:        {{ metadata.extension_id }}.xpi
 %{__install} -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/%{name}.1
 %{__ln_s} %{mozappdir}/firefox %{buildroot}%{_bindir}/%{name}
 %{__mkdir_p} %{buildroot}/%{mozappdir}/distribution/extensions
+%{__install} -m 0644 %{_sourcedir}/firefox/distribution/distribution.ini %{buildroot}%{mozappdir}/distribution/distribution.ini
 {%- for codename, metadata in LANGUAGES.items() %}
 %{__install} -m 0644 %{SOURCE{{ loop.index + 2 }}} %{buildroot}%{mozappdir}/distribution/extensions/{{ metadata.extension_id }}.xpi
 {%- endfor %}
diff --git a/python/mozbuild/mozbuild/repackaging/rpm.py b/python/mozbuild/mozbuild/repackaging/rpm.py
@@ -93,7 +93,7 @@ def repackage_rpm(
         ) as f:
             f.write("This is a packaged app.\n")
 
-        inject_distribution_folder(source_dir, "rpm", app_name)
+        inject_distribution_folder(rpm_dir, "", app_name)
         inject_desktop_entry_file(
             log,
             rpm_dir,