From 676dc2885645ca97f0252aa1b391288739c690c22883b332cf9dc2bf3a916722 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 24 Jan 2018 09:14:26 +0000 Subject: [PATCH] - Rework provides/conflicts between -devel variants. OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=35 --- wxGTK3-3_2.changes | 5 +++++ wxGTK3-3_2.spec | 13 ++++++------- wxQt-3_2.changes | 5 +++++ wxQt-3_2.spec | 13 ++++++------- wxWidgets-3_2.changes | 5 +++++ wxWidgets-3_2.spec | 12 ++++++------ 6 files changed, 33 insertions(+), 20 deletions(-) diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes index 78d1696..e9b3a01 100644 --- a/wxGTK3-3_2.changes +++ b/wxGTK3-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de + +- Rework provides/conflicts between -devel variants. + ------------------------------------------------------------------- Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index 484c786..0999830 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -1,7 +1,7 @@ # # spec file for package wxGTK3-3_2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -66,7 +66,7 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) %description -wxWidgets is a free C++ library for cross-platform GUI. +wxWidgets is a C++ library for cross-platform GUI. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. @@ -195,7 +195,7 @@ SDL Plugin for the wxWidgets cross-platform GUI. %endif %package devel -Summary: Everything needed for development with wxWidgets +Summary: Development files for GTK3-backed wxWidgets 3.2 Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version @@ -216,12 +216,11 @@ Requires: libwx_baseu_xml-%variant%sonum = %version Requires: pkgconfig(gl) Requires: pkgconfig(glu) Provides: wxGTK3-devel = %version-%release -Provides: wxWidgets-experimental-devel = %version-%release -Conflicts: wxWidgets-devel -Conflicts: otherproviders(wxWidgets-experimental-devel) +Provides: wxWidgets-any-devel +Conflicts: wxWidgets-any-devel %description devel -wxWidgets is a free C++ library for cross-platform GUI development. +wxWidgets is a C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. diff --git a/wxQt-3_2.changes b/wxQt-3_2.changes index 78d1696..e9b3a01 100644 --- a/wxQt-3_2.changes +++ b/wxQt-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de + +- Rework provides/conflicts between -devel variants. + ------------------------------------------------------------------- Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index 4b0e9a9..ec24b60 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -1,7 +1,7 @@ # # spec file for package wxQt-3_2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -70,7 +70,7 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(glu) %description -wxWidgets is a free C++ library for cross-platform GUI. +wxWidgets is a C++ library for cross-platform GUI. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. @@ -199,7 +199,7 @@ SDL Plugin for the wxWidgets cross-platform GUI. %endif %package devel -Summary: Everything needed for development with wxWidgets +Summary: Development files for Qt-backed wxWidgets 3.2 Group: Development/Libraries/C and C++ Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version Requires: libwx_%{toolkit}u_aui-%variant%sonum = %version @@ -217,12 +217,11 @@ Requires: libwx_baseu-%variant%sonum = %version Requires: libwx_baseu_net-%variant%sonum = %version Requires: libwx_baseu_xml-%variant%sonum = %version Provides: wxQt-devel = %version-%release -Provides: wxWidgets-experimental-devel = %version-%release -Conflicts: wxWidgets-devel -Conflicts: otherproviders(wxWidgets-experimental-devel) +Provides: wxWidgets-any-devel +Conflicts: wxWidgets-any-devel %description devel -wxWidgets is a free C++ library for cross-platform GUI development. +wxWidgets is a C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index 78d1696..e9b3a01 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de + +- Rework provides/conflicts between -devel variants. + ------------------------------------------------------------------- Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 2a26c41..88fe60e 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -1,7 +1,7 @@ # # spec file for package wxWidgets-3_2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -67,7 +67,7 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) %description -wxWidgets is a free C++ library for cross-platform GUI. +wxWidgets is a C++ library for cross-platform GUI. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. @@ -196,7 +196,7 @@ SDL Plugin for the wxWidgets cross-platform GUI. %endif %package devel -Summary: Everything needed for development with wxWidgets +Summary: Development files for GTK2-backed wxWidgets 3.2 Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version @@ -217,15 +217,15 @@ Requires: libwx_baseu_xml-%variant%sonum = %version Requires: pkgconfig(gl) Requires: pkgconfig(glu) Provides: wxGTK2-devel = %version-%release +Provides: wxWidgets-any-devel Provides: wxWidgets-devel = %version-%release -Conflicts: otherproviders(wxWidgets-devel) -Conflicts: wxWidgets-experimental-devel +Conflicts: wxWidgets-any-devel # Name up to openSUSE 11.3 and up to wxGTK-2.8.x: Provides: wxGTK-devel = %version-%release Obsoletes: wxGTK-devel <= %version-%release %description devel -wxWidgets is a free C++ library for cross-platform GUI development. +wxWidgets is a C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.