1
0

- Rework provides/conflicts between -devel variants.

OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=35
This commit is contained in:
Jan Engelhardt 2018-01-24 09:14:26 +00:00 committed by Git OBS Bridge
parent 26f2af4b01
commit 676dc28856
6 changed files with 33 additions and 20 deletions

View File

@ -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 Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package wxGTK3-3_2 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -66,7 +66,7 @@ BuildRequires: zlib-devel
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
%description %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+, With wxWidgets, you can create applications for different GUIs (GTK+,
Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. 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 %endif
%package devel %package devel
Summary: Everything needed for development with wxWidgets Summary: Development files for GTK3-backed wxWidgets 3.2
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: gtk%gtk_version-devel Requires: gtk%gtk_version-devel
Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version
@ -216,12 +216,11 @@ Requires: libwx_baseu_xml-%variant%sonum = %version
Requires: pkgconfig(gl) Requires: pkgconfig(gl)
Requires: pkgconfig(glu) Requires: pkgconfig(glu)
Provides: wxGTK3-devel = %version-%release Provides: wxGTK3-devel = %version-%release
Provides: wxWidgets-experimental-devel = %version-%release Provides: wxWidgets-any-devel
Conflicts: wxWidgets-devel Conflicts: wxWidgets-any-devel
Conflicts: otherproviders(wxWidgets-experimental-devel)
%description 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+, With wxWidgets, you can create applications for different GUIs (GTK+,
Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.

View File

@ -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 Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package wxQt-3_2 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -70,7 +70,7 @@ BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
%description %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+, With wxWidgets, you can create applications for different GUIs (GTK+,
Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. 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 %endif
%package devel %package devel
Summary: Everything needed for development with wxWidgets Summary: Development files for Qt-backed wxWidgets 3.2
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version
Requires: libwx_%{toolkit}u_aui-%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_net-%variant%sonum = %version
Requires: libwx_baseu_xml-%variant%sonum = %version Requires: libwx_baseu_xml-%variant%sonum = %version
Provides: wxQt-devel = %version-%release Provides: wxQt-devel = %version-%release
Provides: wxWidgets-experimental-devel = %version-%release Provides: wxWidgets-any-devel
Conflicts: wxWidgets-devel Conflicts: wxWidgets-any-devel
Conflicts: otherproviders(wxWidgets-experimental-devel)
%description 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+, With wxWidgets, you can create applications for different GUIs (GTK+,
Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.

View File

@ -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 Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package wxWidgets-3_2 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -67,7 +67,7 @@ BuildRequires: zlib-devel
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
%description %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+, With wxWidgets, you can create applications for different GUIs (GTK+,
Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. 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 %endif
%package devel %package devel
Summary: Everything needed for development with wxWidgets Summary: Development files for GTK2-backed wxWidgets 3.2
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: gtk%gtk_version-devel Requires: gtk%gtk_version-devel
Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version
@ -217,15 +217,15 @@ Requires: libwx_baseu_xml-%variant%sonum = %version
Requires: pkgconfig(gl) Requires: pkgconfig(gl)
Requires: pkgconfig(glu) Requires: pkgconfig(glu)
Provides: wxGTK2-devel = %version-%release Provides: wxGTK2-devel = %version-%release
Provides: wxWidgets-any-devel
Provides: wxWidgets-devel = %version-%release Provides: wxWidgets-devel = %version-%release
Conflicts: otherproviders(wxWidgets-devel) Conflicts: wxWidgets-any-devel
Conflicts: wxWidgets-experimental-devel
# Name up to openSUSE 11.3 and up to wxGTK-2.8.x: # Name up to openSUSE 11.3 and up to wxGTK-2.8.x:
Provides: wxGTK-devel = %version-%release Provides: wxGTK-devel = %version-%release
Obsoletes: wxGTK-devel <= %version-%release Obsoletes: wxGTK-devel <= %version-%release
%description 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+, With wxWidgets, you can create applications for different GUIs (GTK+,
Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.