diff --git a/wxGTK3.spec b/wxGTK3.spec index 9a4b17558360f107d105c7a60ee657ce3b29e725..41c7c107fd64929e6361c0e0f10da2bbe698a64f 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -1,6 +1,6 @@ Name: wxGTK3 Version: 3.2.8 -Release: 1 +Release: 2 Summary: C++ Library for Cross-Platform Development License: GPL-2.0-or-later or LGPL-2.1-only @@ -17,7 +17,6 @@ BuildRequires: pkgconfig(fontconfig) >= 2.8.0 BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-player-1.0) >= 1.7.2.1 BuildRequires: pkgconfig(gstreamer-video-1.0) -BuildRequires: pkgconfig(gtk+-2.0) >= 2.6.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-unix-print-3.0) BuildRequires: pkgconfig(libcurl) @@ -48,6 +47,9 @@ Provides: wxWidgets = %{version}-%{release} bundled(scintilla) = 3.2.1 Provides: wxGTK3-gl = %{version}-%{release} wxGTK3-media = %{version}-%{release} wxGTK3-webview = %{version}-%{release} Obsoletes: wxGTK3-gl < %{version}-%{release} wxGTK3-media < %{version}-%{release} wxGTK3-webview < %{version}-%{release} +Obsoletes: compat-wxGTK3-gtk2 < %version-%{release} +Obsoletes: compat-wxGTK3-gtk2-gl < %version-%{release} +Obsoletes: compat-wxGTK3-gtk2-media < %version-%{release} %description wxWidgets is a C++ library for cross-platform GUI. @@ -55,20 +57,6 @@ With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. This package contains all library of GTK3-backed wxWidgets. -%package -n compat-wxGTK3-gtk2 -Summary: C++ Library for Cross-Platform Development of GTK2-backed wxWidgets -Requires: wxBase3 = %{version}-%{release} wxGTK3-i18n = %{version}-%{release} -Provides: compat-wxWidgets-gtk2 = %{version}-%{release} bundled(scintilla) = 3.2.1 - -Provides: compat-wxGTK3-gtk2-gl = %{version}-%{release} compat-wxGTK3-gtk2-media = %{version}-%{release} -Obsoletes: compat-wxGTK3-gtk2-gl < %{version}-%{release} compat-wxGTK3-gtk2-media < %{version}-%{release} - -%description -n compat-wxGTK3-gtk2 -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. -This package contains all library of GTK2-backed wxWidgets. - %package -n wxBase3-devel Summary: Development files for GTK2-backed and GTK3-backed wxWidgets Requires: wxBase3 = %{version}-%{release} @@ -85,22 +73,11 @@ Requires: wxGTK3-media = %{version}-%{release} wxGTK3-webview = %{version} Requires: wxBase3 = %{version}-%{release} wxBase3-devel = %{version}-%{release} Requires: gtk3-devel libGLU-devel Provides: wxWidgets-devel = %{version}-%{release} +Obsoletes: compat-wxGTK3-gtk2-devel < %version-%{release} %description devel This package contains all files needed for developing with GTK3-backed wxWidgets. -%package -n compat-wxGTK3-gtk2-devel -Summary: Development files for GTK2-backed wxWidgets -Requires: compat-wxGTK3-gtk2 = %{version}-%{release} compat-wxGTK3-gtk2-gl = %{version}-%{release} -Requires: compat-wxGTK3-gtk2-media = %{version}-%{release} -Requires: wxBase3 = %{version}-%{release} wxBase3-devel = %{version}-%{release} -Requires: gtk2-devel libGLU-devel -Provides: compat-wxWidgets-gtk2-devel = %{version}-%{release} - -%description -n compat-wxGTK3-gtk2-devel -This package contains all files needed for developing with GTK2-backed wxWidgets. - - %package i18n Summary: i18n message catalogs of the wxGTK3 BuildArch: noarch @@ -144,23 +121,10 @@ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export LDFLAGS="%{build_ldflags} -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,--as-needed" export CPPUNIT_CONFIG="/usr/bin/pkg-config cppunit" -%global _configure ../configure - -install -d bld_gtk2 -cd bld_gtk2 -%configure --with-gtk=2 --with-opengl --with-sdl --with-libmspack --enable-intl \ - --disable-rpath --disable-glcanvasegl --enable-ipv6 - -%make_build -cd - - -install -d bld_gtk3 -cd bld_gtk3 %configure --with-gtk=3 --with-opengl --with-sdl --with-libmspack --enable-intl \ --disable-rpath --disable-glcanvasegl --enable-ipv6 %make_build -cd - WX_SKIP_DOXYGEN_VERSION_CHECK=1 docs/doxygen/regen.sh html mv docs/doxygen/out/html . @@ -170,13 +134,7 @@ WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh xml cd - %install -cd bld_gtk2 %make_install -cd - - -cd bld_gtk3 -%make_install -cd - rm %{buildroot}%{_bindir}/wx-config install -pD -m 755 %{S:1} %{buildroot}%{_libexecdir}/wxGTK3/wx-config @@ -195,13 +153,7 @@ mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile %find_lang wxstd-3.2 %check -cd bld_gtk2/tests -%make_build test -cd - - -cd bld_gtk3/tests -%make_build test -cd - +%make_build test -C tests %post -n wxBase3-devel if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then rm %{_bindir}/wx-config; fi; @@ -221,9 +173,6 @@ fi %dir %{_libdir}/wx %{_libdir}/wx/3.2 -%files -n compat-wxGTK3-gtk2 -%{_libdir}/libwx_gtk2u_*.so.* - %files -n wxBase3-devel %ghost %{_bindir}/{wx-config,wxrc} %{_bindir}/{wxrc-3.2,wx-config-3.2} @@ -239,10 +188,6 @@ fi %{_libdir}/libwx_gtk3u_*.so %{_libdir}/wx/{config/gtk3-unicode-3.2,include/gtk3-unicode-3.2} -%files -n compat-wxGTK3-gtk2-devel -%{_libdir}/libwx_gtk2u_*.so -%{_libdir}/wx/{config/gtk2-unicode-3.2,include/gtk2-unicode-3.2} - %files i18n -f wxstd-3.2.lang %files -n wxBase3 @@ -253,6 +198,9 @@ fi %doc html %changelog +* Thu May 08 2025 Funda Wang - 3.2.8-2 +- do not build gtk2 flavour as other distros + * Fri Apr 25 2025 Funda Wang - 3.2.8-1 - update to 3.2.8