From 652e51ae6b7ba16a04871adef031d99ba0c76907 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 10 Sep 2018 14:25:45 +0200 Subject: [PATCH] Update caribou obsoletes Make sure to obsolete all of caribou subpackages, and add guards so that they only take effect on RHEL. In Fedora, we have fedora-obsolete-packages already obsoleting caribou. --- gnome-shell.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnome-shell.spec b/gnome-shell.spec index f0cb097..4cf2661 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -114,7 +114,16 @@ Requires: libgweather%{?_isa} # needed for thunderbolt support Requires: bolt%{?_isa} -Obsoletes: caribou +%if 0%{?rhel} +# In Fedora, fedora-obsolete-packages obsoletes caribou +Obsoletes: caribou < 0.4.21-10 +Obsoletes: caribou-antler < 0.4.21-10 +Obsoletes: caribou-devel < 0.4.21-10 +Obsoletes: caribou-gtk2-module < 0.4.21-10 +Obsoletes: caribou-gtk3-module < 0.4.21-10 +Obsoletes: python2-caribou < 0.4.21-10 +Obsoletes: python3-caribou < 0.4.21-10 +%endif %description GNOME Shell provides core user interface functions for the GNOME 3 desktop,