From 5d079be42fa83770c621a6c6485db2554c3d7e82 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 5 Feb 2021 15:14:29 +0100 Subject: [PATCH] Add explicit conflicts with xdg-utils --- flatpak-xdg-utils.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/flatpak-xdg-utils.spec b/flatpak-xdg-utils.spec index c2a3cd6..111ce5b 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: 1%{?dist} +Release: 2%{?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,6 +12,10 @@ 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. @@ -47,6 +51,9 @@ run commands on the host, or use one of the session or system helpers. %{_bindir}/flatpak-spawn %changelog +* Fri Feb 05 2021 Kalev Lember - 1.0.4-2 +- Add explicit conflicts with xdg-utils + * Tue Feb 02 2021 Kalev Lember - 1.0.4-1 - Update to 1.0.4