From 5d55b2e155fdc751320bba5fb66cbf32387801ef864a921e0f5b61470c11fa98 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 29 Mar 2015 20:12:37 +0000 Subject: [PATCH] Update conflicts OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=13 --- wxGTK3-3_2.spec | 5 +++-- wxQt-3_2.spec | 5 +++-- wxWidgets-3_2.spec | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index 58af677..50db707 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -192,9 +192,10 @@ Requires: libwx_gtk%{gtk_version}u_webview-suse2 = %version %endif Requires: libwx_gtk%{gtk_version}u_xrc-suse2 = %version Requires: pkgconfig(glu) -#not fit for general use yet#Provides: wxWidgets-devel = %version-%release -Conflicts: otherproviders(wxWidgets-devel) +Provides: wxWidgets-experimental-devel = %version-%release Provides: wxGTK3-devel = %version-%release +Conflicts: wxWidgets-devel +Conflicts: otherproviders(wxWidgets-experimental-devel) %description devel wxWidgets is a free C++ library for cross-platform GUI development. diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index 067989c..1fdbf6b 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -179,9 +179,10 @@ Requires: libwx_qtu_ribbon-suse2 = %version Requires: libwx_qtu_richtext-suse2 = %version Requires: libwx_qtu_stc-suse2 = %version Requires: libwx_qtu_xrc-suse2 = %version -#not fit for general use yet#Provides: wxWidgets-devel = %version-%release -Conflicts: otherproviders(wxWidgets-devel) +Provides: wxWidgets-experimental-devel = %version-%release Provides: wxQt-devel = %version-%release +Conflicts: wxWidgets-devel +Conflicts: otherproviders(wxWidgets-experimental-devel) %description devel wxWidgets is a free C++ library for cross-platform GUI development. diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 1afc3bb..dcb0efb 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -235,8 +235,9 @@ Requires: libwx_gtk%{gtk_version}u_webview-suse2 = %version Requires: libwx_gtk%{gtk_version}u_xrc-suse2 = %version Requires: pkgconfig(glu) Provides: wxWidgets-devel = %version-%release +Provides: wxGTK2-devel = %version-%release Conflicts: otherproviders(wxWidgets-devel) -Provides: wxGTK3-devel = %version-%release +Conflicts: wxWidgets-experimental-devel # Name up to openSUSE 11.3 and up to wxGTK-2.8.x: Provides: wxGTK-devel = %version-%release Obsoletes: wxGTK-devel <= %version-%release