From 9771033ee5e5eb1bc793ff9185ee4791e53c714f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 5 Feb 2021 17:27:52 +0100 Subject: [PATCH] Add flatpak- prefix to executables to avoid conflicting with xdg-utils This also makes sure we don't provide /usr/bin/xdg-open and /usr/bin/xdg-email as that can cause the wrong package (flatpak-xdg-utils) to be pulled in instead of regular xdg-utils on regular Fedora installs. This goes together with flatpak-runtime and flatpak-sdk changes to install flatpak-xdg-open and flatpak-xdg-email as /usr/bin/xdg-open and /usr/bin/xdg-email. --- flatpak-xdg-utils.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/flatpak-xdg-utils.spec b/flatpak-xdg-utils.spec index 111ce5b..5e1c6bf 100644 --- a/flatpak-xdg-utils.spec +++ b/flatpak-xdg-utils.spec @@ -1,7 +1,7 @@ Name: flatpak-xdg-utils Summary: Command-line tools for use inside Flatpak sandboxes Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: https://github.com/flatpak/flatpak-xdg-utils Source: https://github.com/flatpak/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -12,10 +12,6 @@ BuildRequires: pkgconfig(glib-2.0) Requires: flatpak-spawn%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -# /usr/bin/xdg-email and /usr/bin/xdg-open are shipped in both -# flatpak-xdg-utils and xdg-utils -Conflicts: xdg-utils - %description This package contains a number of command-line utilities for use inside Flatpak sandboxes. They work by talking to portals. @@ -40,17 +36,23 @@ run commands on the host, or use one of the session or system helpers. %install %meson_install +mv $RPM_BUILD_ROOT%{_bindir}/xdg-email $RPM_BUILD_ROOT%{_bindir}/flatpak-xdg-email +mv $RPM_BUILD_ROOT%{_bindir}/xdg-open $RPM_BUILD_ROOT%{_bindir}/flatpak-xdg-open + %files %doc README.md %license COPYING -%{_bindir}/xdg-email -%{_bindir}/xdg-open +%{_bindir}/flatpak-xdg-email +%{_bindir}/flatpak-xdg-open %files -n flatpak-spawn %license COPYING %{_bindir}/flatpak-spawn %changelog +* Fri Feb 05 2021 Kalev Lember - 1.0.4-3 +- Add flatpak- prefix to executables to avoid conflicting with xdg-utils + * Fri Feb 05 2021 Kalev Lember - 1.0.4-2 - Add explicit conflicts with xdg-utils