From 01b66b68cbb8fc376513466da644a4702c0c149aed5fca8ebcd658a7c05b291e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 9 Jan 2017 08:34:45 +0000 Subject: [PATCH] Accepting request 448704 from home:scarabeus_iv:branches:network:utilities - Obsolete the ui-gtk in the ui-qt to ensure clean non-conflicted install OBS-URL: https://build.opensuse.org/request/show/448704 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=193 --- wireshark.changes | 5 +++++ wireshark.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wireshark.changes b/wireshark.changes index c666c7e..09fa207 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 4 10:32:57 UTC 2017 - tchvatal@suse.com + +- Obsolete the ui-gtk in the ui-qt to ensure clean non-conflicted install + ------------------------------------------------------------------- Tue Dec 27 11:33:33 UTC 2016 - tchvatal@suse.com diff --git a/wireshark.spec b/wireshark.spec index a344c0c..8db4785 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -1,7 +1,7 @@ # # spec file for package wireshark # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -185,6 +185,8 @@ Summary: A Network Traffic Analyser - Qt UI Group: Productivity/Networking/Diagnostic Requires: %{name} = %{version} Provides: %{name}-ui = %{version} +# gtk is the deprecated ui so ensure its uninstall +Obsoletes: %{name}-ui-gtk %description ui-qt This package contains the Qt based UI for Wireshark.