diff --git a/.goreleaser_ui_gtk3.yaml b/.goreleaser_ui_gtk3.yaml index 75ff88a49..a6cfd199e 100644 --- a/.goreleaser_ui_gtk3.yaml +++ b/.goreleaser_ui_gtk3.yaml @@ -43,19 +43,17 @@ archives: - netbird-ui-gtk3 nfpms: - # Same package_name as the GTK4 packages -- the two are mutually-exclusive - # alternatives served from separate repo paths (see uploads below); a given - # distro points at exactly one of them. The file names must still differ: - # the Debian pool is shared storage keyed by file name, so a default-named - # gtk3 .deb would overwrite the stable one. + # Mutually-exclusive alternative to the GTK4 netbird-ui package -- both + # ship the same /usr/bin/netbird-ui from the shared stable/yum repos, so + # this one carries its own name and conflicts with the GTK4 package. - maintainer: Netbird description: Netbird client UI. homepage: https://netbird.io/ license: BSD-3-Clause vendor: NetBird id: netbird_ui_deb_gtk3 - package_name: netbird-ui - file_name_template: "{{ .PackageName }}-gtk3_{{ .Version }}_{{ .Os }}_{{ .Arch }}" + package_name: netbird-ui-gtk3 + file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}" builds: - netbird-ui-gtk3 formats: @@ -67,6 +65,10 @@ nfpms: dst: /usr/share/applications/org.wails.netbird.desktop - src: client/ui/build/appicon.png dst: /usr/share/pixmaps/netbird.png + conflicts: + - netbird-ui + replaces: + - netbird-ui dependencies: - netbird (>= 0.75.0) - libgtk-3-0 @@ -79,8 +81,8 @@ nfpms: license: BSD-3-Clause vendor: NetBird id: netbird_ui_rpm_gtk3 - package_name: netbird-ui - file_name_template: "{{ .PackageName }}-gtk3_{{ .Version }}_{{ .Os }}_{{ .Arch }}" + package_name: netbird-ui-gtk3 + file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}" builds: - netbird-ui-gtk3 formats: @@ -92,6 +94,10 @@ nfpms: dst: /usr/share/applications/org.wails.netbird.desktop - src: client/ui/build/appicon.png dst: /usr/share/pixmaps/netbird.png + # No `replaces` here: nfpm maps it to rpm Obsoletes, which would make + # dnf swap installed GTK4 netbird-ui packages for this one on upgrade. + conflicts: + - netbird-ui dependencies: - netbird >= 0.75.0 - (gtk3 or libgtk-3-0)