forked from jengelh/wxWidgets-3_2
Accepting request 568880 from X11:wxWidgets
- Rework provides/conflicts between -devel variants. OBS-URL: https://build.opensuse.org/request/show/568880 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wxWidgets-3_2?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
0ade45e0aa
@ -15,6 +15,7 @@ Record of names used in openSUSE:
|
||||
wxWidgets 3.0.2: libwx_*-suse.so.1
|
||||
wxWidgets 3.1.0~g61143(dp only): libwx_*-suse.so.2
|
||||
wxWidgets 3.1.0.g2244(dp only): libwx_*-suse.so.4
|
||||
wxWidgets 3.1.1~2640(dp only): libwx_*-suse.so.5
|
||||
|
||||
Since SOVERLINUX does not support TWOSYMLINKS=0, patch and use
|
||||
a bit on SOVERSOLARIS instead.
|
||||
@ -49,7 +50,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in
|
||||
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
|
||||
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1
|
||||
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).4
|
||||
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5
|
||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de
|
||||
|
||||
- Rework provides/conflicts between -devel variants.
|
||||
- Update to new development snapshot 3.1.1~2640
|
||||
* Support for multi-touch gestures
|
||||
* Implement persistence for wxDataViewListCtrl
|
||||
* Rename all objects to "DataViewCtrl" and "DVC" instead of
|
||||
"DataViewListCtrl" and "DVLC" to reflect the change of
|
||||
implementation at the base class.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de
|
||||
|
||||
|
||||
@ -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
|
||||
@ -20,8 +20,8 @@ Name: wxGTK3-3_2
|
||||
%define base_name wxWidgets-3_2
|
||||
%define tarball_name wxWidgets
|
||||
%define variant suse
|
||||
%define sonum 4
|
||||
Version: 3.1.1~2244
|
||||
%define sonum 5
|
||||
Version: 3.1.1~2640
|
||||
Release: 0
|
||||
%define wx_minor 3.1
|
||||
%define wx_micro 3.1.1
|
||||
@ -66,11 +66,10 @@ 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.
|
||||
|
||||
%if %base_packages
|
||||
%package -n libwx_baseu-%variant%sonum
|
||||
Summary: wxWidgets Library
|
||||
# Name up to openSUSE 11.3 and up to wxGTK-2.8:
|
||||
@ -98,8 +97,6 @@ Group: System/Libraries
|
||||
%description -n libwx_baseu_xml-%variant%sonum
|
||||
Library for the wxWidgets cross-platform GUI.
|
||||
|
||||
%endif
|
||||
|
||||
%package -n libwx_%{toolkit}u_adv-%variant%sonum
|
||||
Summary: wxWidgets Library
|
||||
Group: System/Libraries
|
||||
@ -184,7 +181,6 @@ Group: System/Libraries
|
||||
%description -n libwx_%{toolkit}u_xrc-%variant%sonum
|
||||
Library for the wxWidgets cross-platform GUI.
|
||||
|
||||
%if %base_packages
|
||||
%package plugin-sound_sdlu-3_2
|
||||
Summary: wxWidgets SDL Plugin
|
||||
Group: System/Libraries
|
||||
@ -192,10 +188,8 @@ Group: System/Libraries
|
||||
%description plugin-sound_sdlu-3_2
|
||||
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 +210,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.
|
||||
|
||||
@ -264,13 +257,10 @@ autoconf -f -i
|
||||
--enable-plugins
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%clean
|
||||
:
|
||||
|
||||
%install
|
||||
export VENDORTAG='-$variant' # only needed for non-MSW
|
||||
make install DESTDIR="%buildroot"
|
||||
%if %base_packages==0
|
||||
%if !%base_packages
|
||||
# Drop libraries already supplied by another packages
|
||||
rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
|
||||
"%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
|
||||
@ -280,14 +270,12 @@ rm -Rf %buildroot/%_datadir/locale
|
||||
# HACK: Fix wx-config symlink (bug introduced in 2.9.4).
|
||||
ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
|
||||
|
||||
%if %base_packages
|
||||
%post -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
|
||||
%post -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
|
||||
%post -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
|
||||
%endif
|
||||
%post -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de
|
||||
|
||||
- Rework provides/conflicts between -devel variants.
|
||||
- Update to new development snapshot 3.1.1~2640
|
||||
* Support for multi-touch gestures
|
||||
* Implement persistence for wxDataViewListCtrl
|
||||
* Rename all objects to "DataViewCtrl" and "DVC" instead of
|
||||
"DataViewListCtrl" and "DVLC" to reflect the change of
|
||||
implementation at the base class.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de
|
||||
|
||||
|
||||
@ -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
|
||||
@ -20,8 +20,8 @@ Name: wxQt-3_2
|
||||
%define base_name wxWidgets-3_2
|
||||
%define tarball_name wxWidgets
|
||||
%define variant suse
|
||||
%define sonum 4
|
||||
Version: 3.1.1~2244
|
||||
%define sonum 5
|
||||
Version: 3.1.1~2640
|
||||
Release: 0
|
||||
%define wx_minor 3.1
|
||||
%define wx_micro 3.1.1
|
||||
@ -70,11 +70,10 @@ 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.
|
||||
|
||||
%if %base_packages
|
||||
%package -n libwx_baseu-%variant%sonum
|
||||
Summary: wxWidgets Library
|
||||
# Name up to openSUSE 11.3 and up to wxGTK-2.8:
|
||||
@ -102,8 +101,6 @@ Group: System/Libraries
|
||||
%description -n libwx_baseu_xml-%variant%sonum
|
||||
Library for the wxWidgets cross-platform GUI.
|
||||
|
||||
%endif
|
||||
|
||||
%package -n libwx_%{toolkit}u_adv-%variant%sonum
|
||||
Summary: wxWidgets Library
|
||||
Group: System/Libraries
|
||||
@ -188,7 +185,6 @@ Group: System/Libraries
|
||||
%description -n libwx_%{toolkit}u_xrc-%variant%sonum
|
||||
Library for the wxWidgets cross-platform GUI.
|
||||
|
||||
%if %base_packages
|
||||
%package plugin-sound_sdlu-3_2
|
||||
Summary: wxWidgets SDL Plugin
|
||||
Group: System/Libraries
|
||||
@ -196,10 +192,8 @@ Group: System/Libraries
|
||||
%description plugin-sound_sdlu-3_2
|
||||
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 +211,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.
|
||||
|
||||
@ -265,13 +258,10 @@ autoconf -f -i
|
||||
--enable-plugins
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%clean
|
||||
:
|
||||
|
||||
%install
|
||||
export VENDORTAG='-$variant' # only needed for non-MSW
|
||||
make install DESTDIR="%buildroot"
|
||||
%if %base_packages==0
|
||||
%if !%base_packages
|
||||
# Drop libraries already supplied by another packages
|
||||
rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
|
||||
"%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
|
||||
@ -281,14 +271,12 @@ rm -Rf %buildroot/%_datadir/locale
|
||||
# HACK: Fix wx-config symlink (bug introduced in 2.9.4).
|
||||
ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
|
||||
|
||||
%if %base_packages
|
||||
%post -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
|
||||
%post -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
|
||||
%post -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
|
||||
%endif
|
||||
%post -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:964c2da4a947af84adb683d4a564ad549d48058ec8048eca6df7a2fb3f7931b3
|
||||
size 21657792
|
||||
3
wxWidgets-3.1.1~2640.tar.xz
Normal file
3
wxWidgets-3.1.1~2640.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fcf65d6ef76ebd590b64088274b802711e23bb8889a116874b21a29df34b7afd
|
||||
size 21917832
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de
|
||||
|
||||
- Rework provides/conflicts between -devel variants.
|
||||
- Update to new development snapshot 3.1.1~2640
|
||||
* Support for multi-touch gestures
|
||||
* Implement persistence for wxDataViewListCtrl
|
||||
* Rename all objects to "DataViewCtrl" and "DVC" instead of
|
||||
"DataViewListCtrl" and "DVLC" to reflect the change of
|
||||
implementation at the base class.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de
|
||||
|
||||
|
||||
@ -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
|
||||
@ -20,8 +20,8 @@ Name: wxWidgets-3_2
|
||||
%define base_name wxWidgets-3_2
|
||||
%define tarball_name wxWidgets
|
||||
%define variant suse
|
||||
%define sonum 4
|
||||
Version: 3.1.1~2244
|
||||
%define sonum 5
|
||||
Version: 3.1.1~2640
|
||||
Release: 0
|
||||
%define wx_minor 3.1
|
||||
%define wx_micro 3.1.1
|
||||
@ -67,11 +67,10 @@ 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.
|
||||
|
||||
%if %base_packages
|
||||
%package -n libwx_baseu-%variant%sonum
|
||||
Summary: wxWidgets Library
|
||||
# Name up to openSUSE 11.3 and up to wxGTK-2.8:
|
||||
@ -99,8 +98,6 @@ Group: System/Libraries
|
||||
%description -n libwx_baseu_xml-%variant%sonum
|
||||
Library for the wxWidgets cross-platform GUI.
|
||||
|
||||
%endif
|
||||
|
||||
%package -n libwx_%{toolkit}u_adv-%variant%sonum
|
||||
Summary: wxWidgets Library
|
||||
Group: System/Libraries
|
||||
@ -185,7 +182,6 @@ Group: System/Libraries
|
||||
%description -n libwx_%{toolkit}u_xrc-%variant%sonum
|
||||
Library for the wxWidgets cross-platform GUI.
|
||||
|
||||
%if %base_packages
|
||||
%package plugin-sound_sdlu-3_2
|
||||
Summary: wxWidgets SDL Plugin
|
||||
Group: System/Libraries
|
||||
@ -193,10 +189,8 @@ Group: System/Libraries
|
||||
%description plugin-sound_sdlu-3_2
|
||||
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 +211,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.
|
||||
|
||||
@ -267,13 +261,10 @@ autoconf -f -i
|
||||
--enable-plugins
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%clean
|
||||
:
|
||||
|
||||
%install
|
||||
export VENDORTAG='-$variant' # only needed for non-MSW
|
||||
make install DESTDIR="%buildroot"
|
||||
%if %base_packages==0
|
||||
%if !%base_packages
|
||||
# Drop libraries already supplied by another packages
|
||||
rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
|
||||
"%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
|
||||
@ -283,14 +274,12 @@ rm -Rf %buildroot/%_datadir/locale
|
||||
# HACK: Fix wx-config symlink (bug introduced in 2.9.4).
|
||||
ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
|
||||
|
||||
%if %base_packages
|
||||
%post -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
|
||||
%post -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
|
||||
%post -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
|
||||
%endif
|
||||
%post -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
|
||||
%postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
|
||||
%post -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
|
||||
|
||||
Loading…
Reference in New Issue
Block a user