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.
This commit is contained in:
Kalev Lember 2021-02-05 17:27:52 +01:00
parent 5d079be42f
commit 9771033ee5

View File

@ -1,7 +1,7 @@
Name: flatpak-xdg-utils Name: flatpak-xdg-utils
Summary: Command-line tools for use inside Flatpak sandboxes Summary: Command-line tools for use inside Flatpak sandboxes
Version: 1.0.4 Version: 1.0.4
Release: 2%{?dist} Release: 3%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/flatpak/flatpak-xdg-utils URL: https://github.com/flatpak/flatpak-xdg-utils
Source: https://github.com/flatpak/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz 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} 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 %description
This package contains a number of command-line utilities for use inside This package contains a number of command-line utilities for use inside
Flatpak sandboxes. They work by talking to portals. 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 %install
%meson_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 %files
%doc README.md %doc README.md
%license COPYING %license COPYING
%{_bindir}/xdg-email %{_bindir}/flatpak-xdg-email
%{_bindir}/xdg-open %{_bindir}/flatpak-xdg-open
%files -n flatpak-spawn %files -n flatpak-spawn
%license COPYING %license COPYING
%{_bindir}/flatpak-spawn %{_bindir}/flatpak-spawn
%changelog %changelog
* Fri Feb 05 2021 Kalev Lember <klember@redhat.com> - 1.0.4-3
- Add flatpak- prefix to executables to avoid conflicting with xdg-utils
* Fri Feb 05 2021 Kalev Lember <klember@redhat.com> - 1.0.4-2 * Fri Feb 05 2021 Kalev Lember <klember@redhat.com> - 1.0.4-2
- Add explicit conflicts with xdg-utils - Add explicit conflicts with xdg-utils