diff --git a/wxWidgets30.spec b/wxWidgets30.spec index 2415ebd..cdfb75e 100644 --- a/wxWidgets30.spec +++ b/wxWidgets30.spec @@ -5,7 +5,7 @@ %define wxBaseu_name libwx_baseu30 Name: wxWidgets30 -Version: 3.0.3 +Version: 3.0.4 Release: 1mamba Summary: GTK+ port of the wxWidgets library Group: System/Libraries @@ -153,18 +153,16 @@ The translations files for the wxWidgets library. %prep %setup -q -n wxWidgets-%{version} -#-D -T -#:<< _EOF + #%patch0 -p1 -%patch1 -p1 +#%patch1 -p1 # FIXME: %{_datadir}/bakefile/presets generates a conflict between wx 2.6 # and 2.8 devel packages #sed -i "s,bakefile/presets,bakefile/presets-\$(WX_RELEASE),g" Makefile.in %build -#:<< _EOF -# configure and build the ASCII version +# configure and build the UNICODE version %configure \ --with-gtk=3 \ --enable-unicode \ @@ -213,10 +211,12 @@ ln -s wxrc-%{majversion} %{buildroot}%{_bindir}/wxrc-%{majversion}-unicode rm -f %{buildroot}%{_bindir}/wxrc ln -sf %{_libdir}/wx/config/gtk3-unicode-%{majversion} \ - %{buildroot}%{_bindir}/wx-config-unicode-3 + %{buildroot}%{_bindir}/wx-config-unicode-30 rm -f %{buildroot}%{_bindir}/wx-config +mv %{buildroot}%{_datadir}/aclocal/wxwin.m4 %{buildroot}%{_datadir}/aclocal/wxwin30.m4 + install -d %{buildroot}%{_datadir}/wx/examples/src cp -a demos samples %{buildroot}%{_datadir}/wx/examples @@ -235,14 +235,14 @@ cat wxstd.lang wxmsw.lang > %{wxMain}.lang %post -n %{wxBaseu_name}-devel /usr/sbin/update-alternatives --install \ - %{_bindir}/wx-config wx-config %{_bindir}/wx-config-unicode-3 50 \ + %{_bindir}/wx-config wx-config %{_bindir}/wx-config-unicode-30 60 \ --slave %{_bindir}/wxrc wxrc %{_bindir}/wxrc-%{majversion}-unicode : %postun -n %{wxBaseu_name}-devel if [ "$1" = "0" ]; then /usr/sbin/update-alternatives --remove wx-config \ - %{_bindir}/wx-config-unicode-3 + %{_bindir}/wx-config-unicode-30 fi : @@ -251,12 +251,15 @@ fi %{_libdir}/libwx_baseu-%{majversion}.so.* %{_libdir}/libwx_baseu_net-%{majversion}.so.* %{_libdir}/libwx_baseu_xml-%{majversion}.so.* +%dir %{_libdir}/wx/%{majversion} %{_libdir}/wx/%{majversion}/sound_sdlu-%{majversion}.so +%dir %{_libdir}/wx/%{majversion}/web-extensions +%{_libdir}/wx/%{majversion}/web-extensions/webkit2_extu-%{majversion}.so %files -n %{wxBaseu_name}-devel %defattr(-,root,root) %{_bindir}/wxrc-%{majversion} -%{_bindir}/wx-config-unicode-3 +%{_bindir}/wx-config-unicode-30 %{_bindir}/wxrc-*unicode %dir %{_libdir}/wx/include/gtk3-unicode-%{majversion}/ %dir %{_libdir}/wx/include/gtk3-unicode-%{majversion}/wx/ @@ -276,10 +279,9 @@ fi %files -n %{wxMain}-devel %defattr(-,root,root) -%{_includedir}/wx-%{majversion}/ -# note: these files generate conflicts between wx 2.6 and 2.8 -%{_datadir}/aclocal/wxwin.m4 -%{_datadir}/bakefile/ +%dir %{_includedir}/wx-%{majversion}/ +%{_includedir}/wx-%{majversion}/* +%{_datadir}/aclocal/wxwin30.m4 %files -n %{wxMain}-i18n -f %{wxMain}.lang %defattr(-,root,root) @@ -287,8 +289,13 @@ fi %files -n %{wxMain}-examples %defattr(-,root,root) %{_datadir}/wx/examples +%dir %{_datadir}/bakefile/presets +%{_datadir}/bakefile/presets/* %changelog +* Mon Sep 02 2019 Silvan Calarco 3.0.4-1mamba +- update to 3.0.4 + * Thu Nov 30 2017 Silvan Calarco 3.0.3-1mamba - update to 3.0.3