diff options
| author | Emīls <emils@mullvad.net> | 2023-04-17 15:57:47 +0200 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2023-04-17 15:57:47 +0200 |
| commit | f06dfe3e561d5e7ddee6525a2fb13035992c8bdc (patch) | |
| tree | 4cc7b74217120c8a5eda66f5e83379fb93afb3dc | |
| parent | 06998488ae799ec2115081c3f4291015165e4f3a (diff) | |
| parent | 54e8456936da52591ae1efa8ee070e086bb41605 (diff) | |
| download | mullvadvpn-f06dfe3e561d5e7ddee6525a2fb13035992c8bdc.tar.xz mullvadvpn-f06dfe3e561d5e7ddee6525a2fb13035992c8bdc.zip | |
Merge branch 'rpm-installer-clashes-with-other-des-152'
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b095497ee..1fe3de44c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,10 @@ Line wrap the file at 100 chars. Th #### macOS - Fix tray window behaviour when opening mission control and switching between full-screen workspaces. +#### Linux +- Fix RPM package containing unecessary files causing conflicts with other electron-builder based + packages. + ## [2023.3] - 2023-04-05 ### Changed diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 27223df42e..3eb26cb876 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -202,6 +202,10 @@ const config = { rpm: { fpm: [ + // Prevents RPM from packaging build-id metadata, some of which is the + // same across all electron-builder applications, which causes package + // conflicts + '--rpm-rpmbuild-define=_build_id_links none', '--directories=/opt/Mullvad VPN/', '--before-install', distAssets('linux/before-install.sh'), |