X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2c88494b6978bee502f4c856ba9dc7e3b7c3954..bae2dc62af49b5a870bbabd9473a92921736a6f0:/wxGTK.spec?ds=inline diff --git a/wxGTK.spec b/wxGTK.spec index 6d06ff66e4..a7c8d3e975 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -42,12 +42,10 @@ %if %{unicode} %define wxbasename wx-base-unicode %define wxbaseconfig base-unicode-release-%{ver2} - %define wxbaseconfigstatic base-unicode-release-static-%{ver2} %define wxbaseconfiglink wxbaseu-%{ver2}-config %else %define wxbasename wx-base-ansi %define wxbaseconfig base-ansi-release-%{ver2} - %define wxbaseconfigstatic base-ansi-release-static-%{ver2} %define wxbaseconfiglink wxbase-%{ver2}-config %endif @@ -157,18 +155,6 @@ else export MAKE="make" fi -mkdir obj-shared-no-gui -cd obj-shared-no-gui -../configure --prefix=%{_prefix} \ - --disable-gui \ -%if %{unicode} - --enable-unicode -%else - --disable-unicode -%endif -$MAKE -cd .. - mkdir obj-shared cd obj-shared ../configure --prefix=%{_prefix} \ @@ -190,19 +176,6 @@ cd contrib/src $MAKE cd ../../.. -mkdir obj-static-no-gui -cd obj-static-no-gui -../configure --prefix=%{_prefix} \ - --disable-gui \ - --disable-shared \ -%if %{unicode} - --enable-unicode -%else - --disable-unicode -%endif -$MAKE -cd .. - mkdir obj-static cd obj-static ../configure --prefix=%{_prefix} \ @@ -225,12 +198,12 @@ cd contrib/src $MAKE cd ../../.. +make -C locale allmo + %install rm -rf $RPM_BUILD_ROOT -(cd obj-static-no-gui; make DESTDIR=$RPM_BUILD_ROOT install) -(cd obj-static; make DESTDIR=$RPM_BUILD_ROOT install) -(cd obj-shared-no-gui; make DESTDIR=$RPM_BUILD_ROOT install) -(cd obj-shared; make DESTDIR=$RPM_BUILD_ROOT install) +(cd obj-static; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) +(cd obj-shared; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) # --- wxBase headers list begins here --- cat <wxbase-headers.files @@ -250,6 +223,7 @@ wx/confbase.h wx/config.h wx/convauto.h wx/containr.h +wx/cpp.h wx/datetime.h wx/datstrm.h wx/dde.h @@ -266,6 +240,7 @@ wx/except.h wx/features.h wx/ffile.h wx/file.h +wx/fileback.h wx/fileconf.h wx/filefn.h wx/filename.h @@ -302,6 +277,7 @@ wx/msgout.h wx/mstream.h wx/object.h wx/platform.h +wx/platinfo.h wx/power.h wx/process.h wx/ptr_scpd.h @@ -384,6 +360,7 @@ cat <wxbase-headers.paths %{_includedir}/wx-%{ver2}/wx/confbase.h %{_includedir}/wx-%{ver2}/wx/config.h %{_includedir}/wx-%{ver2}/wx/containr.h +%{_includedir}/wx-%{ver2}/wx/convauto.h %{_includedir}/wx-%{ver2}/wx/datetime.h %{_includedir}/wx-%{ver2}/wx/datstrm.h %{_includedir}/wx-%{ver2}/wx/dde.h @@ -421,6 +398,7 @@ cat <wxbase-headers.paths %{_includedir}/wx-%{ver2}/wx/ipcbase.h %{_includedir}/wx-%{ver2}/wx/isql.h %{_includedir}/wx-%{ver2}/wx/isqlext.h +%{_includedir}/wx-%{ver2}/wx/link.h %{_includedir}/wx-%{ver2}/wx/list.h %{_includedir}/wx-%{ver2}/wx/listimpl.cpp %{_includedir}/wx-%{ver2}/wx/log.h @@ -435,8 +413,10 @@ cat <wxbase-headers.paths %{_includedir}/wx-%{ver2}/wx/mstream.h %{_includedir}/wx-%{ver2}/wx/object.h %{_includedir}/wx-%{ver2}/wx/platform.h +%{_includedir}/wx-%{ver2}/wx/power.h %{_includedir}/wx-%{ver2}/wx/process.h %{_includedir}/wx-%{ver2}/wx/ptr_scpd.h +%{_includedir}/wx-%{ver2}/wx/recguard.h %{_includedir}/wx-%{ver2}/wx/regex.h %{_includedir}/wx-%{ver2}/wx/scopeguard.h %{_includedir}/wx-%{ver2}/wx/snglinst.h @@ -494,6 +474,7 @@ cat <wxbase-headers.paths %{_includedir}/wx-%{ver2}/wx/unix/gsockunx.h %{_includedir}/wx-%{ver2}/wx/unix/mimetype.h %{_includedir}/wx-%{ver2}/wx/unix/pipe.h +%{_includedir}/wx-%{ver2}/wx/unix/private.h %{_includedir}/wx-%{ver2}/wx/unix/stackwalk.h %{_includedir}/wx-%{ver2}/wx/unix/stdpaths.h EOF @@ -512,8 +493,14 @@ cp -f -r $RPM_BUILD_ROOT/_save_dir/* $RPM_BUILD_ROOT%{_includedir} rm -rf $RPM_BUILD_ROOT/_save_dir # contrib stuff: -(cd obj-shared/contrib/src; make DESTDIR=$RPM_BUILD_ROOT install) -(cd obj-shared/utils/wxrc; make DESTDIR=$RPM_BUILD_ROOT install) +(cd obj-static/contrib; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) +(cd obj-shared/contrib; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) + +# utils: +(cd obj-shared/utils/wxrc; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) + +# wx-config link is created during package installation, remove it for now +rm -f $RPM_BUILD_ROOT%{_bindir}/wx-config %clean rm -rf $RPM_BUILD_ROOT @@ -581,41 +568,47 @@ rm -f %{_bindir}/%{wxbaseconfiglink} %defattr(-,root,root) %doc COPYING.LIB *.txt %{_libdir}/libwx_%{buildname}_adv-%{ver2}.so.* +%{_libdir}/libwx_%{buildname}_aui-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_core-%{ver2}.so.* %if !%{unicode} %{_libdir}/libwx_%{buildname}_dbgrid-%{ver2}.so.* %endif %{_libdir}/libwx_%{buildname}_html-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_media-%{ver2}.so.* +%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_qa-%{ver2}.so.* +%{_libdir}/libwx_%{buildname}_richtext-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_xrc-%{ver2}.so.* %files -n wx-i18n %defattr(-,root,root) +%{_datadir}/locale/*/LC_MESSAGES/*.mo %files devel -f core-headers.files %defattr(-,root,root) # shared libs %{_libdir}/libwx_%{buildname}_adv-%{ver2}.so +%{_libdir}/libwx_%{buildname}_aui-%{ver2}.so %{_libdir}/libwx_%{buildname}_core-%{ver2}.so %if !%{unicode} %{_libdir}/libwx_%{buildname}_dbgrid-%{ver2}.so %endif %{_libdir}/libwx_%{buildname}_gl-%{ver2}.so %{_libdir}/libwx_%{buildname}_html-%{ver2}.so -%{_libdir}/libwx_%{buildname}_media-%{ver2}.so +%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so %{_libdir}/libwx_%{buildname}_qa-%{ver2}.so +%{_libdir}/libwx_%{buildname}_richtext-%{ver2}.so %{_libdir}/libwx_%{buildname}_xrc-%{ver2}.so # static libs %{_libdir}/libwx_%{buildname}_adv-%{ver2}.a +%{_libdir}/libwx_%{buildname}_aui-%{ver2}.a %{_libdir}/libwx_%{buildname}_core-%{ver2}.a %if !%{unicode} %{_libdir}/libwx_%{buildname}_dbgrid-%{ver2}.a %endif %{_libdir}/libwx_%{buildname}_gl-%{ver2}.a %{_libdir}/libwx_%{buildname}_html-%{ver2}.a -%{_libdir}/libwx_%{buildname}_media-%{ver2}.a %{_libdir}/libwx_%{buildname}_qa-%{ver2}.a +%{_libdir}/libwx_%{buildname}_richtext-%{ver2}.a %{_libdir}/libwx_%{buildname}_xrc-%{ver2}.a %dir %{_libdir}/wx %{_libdir}/wx/config/%{wxconfig} @@ -637,11 +630,8 @@ rm -f %{_bindir}/%{wxbaseconfiglink} %{_libdir}/libwxregexu-%{ver2}.a %endif %dir %{_libdir}/wx -%{_libdir}/wx/config/%{wxbaseconfig} -%{_libdir}/wx/include/%{wxbaseconfig}/wx/setup.h -%{_libdir}/wx/config/%{wxbaseconfigstatic} -%{_libdir}/wx/include/%{wxbaseconfigstatic}/wx/setup.h %{_datadir}/aclocal/*.m4 +%{_datadir}/bakefile/presets/* %files gl %defattr(-,root,root) @@ -660,6 +650,18 @@ rm -f %{_bindir}/%{wxbaseconfiglink} %{_libdir}/libwx_%{buildname}_stc-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_svg-%{ver2}.so.* +# static libs +%{_libdir}/libwx_%{buildname}_animate-%{ver2}.a +%{_libdir}/libwx_%{buildname}_deprecated-%{ver2}.a +%{_libdir}/libwx_%{buildname}_fl-%{ver2}.a +%{_libdir}/libwx_%{buildname}_gizmos-%{ver2}.a +%{_libdir}/libwx_%{buildname}_gizmos_xrc-%{ver2}.a +%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.a +%{_libdir}/libwx_%{buildname}_ogl-%{ver2}.a +%{_libdir}/libwx_%{buildname}_plot-%{ver2}.a +%{_libdir}/libwx_%{buildname}_stc-%{ver2}.a +%{_libdir}/libwx_%{buildname}_svg-%{ver2}.a + %files contrib-devel %defattr(-,root,root) %dir %{_includedir}/wx-%{ver2}/wx/animate