X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18f208c3f6a123aebdec96a3f559bfa5db3fecb8..3abcf424a3e250f5537f9f076d3fb86a925e2547:/wxGTK.spec diff --git a/wxGTK.spec b/wxGTK.spec index b0ecbb910e..970f95c5d5 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,6 +1,6 @@ -%define _prefix /opt/gnome -%define ver 2.6.0 -%define ver2 2.6 +%define _prefix /usr +%define ver 2.7.0 +%define ver2 2.7 %define rel 1 # Configurable settings (use --with(out) {unicode,gtk2} on rpmbuild cmd line): @@ -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 @@ -57,16 +55,16 @@ Version: %{ver} Release: %{rel} License: wxWindows Licence Group: X11/Libraries -Source: wxGTK-%{ver}.tar.gz +Source: wxGTK-%{ver}.tar.bz2 URL: http://www.wxwidgets.org Packager: Vadim Zeitlin Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root Requires: %{wxbasename} = %{ver} %if %{portname} == gtk2 -# BuildRequires: gtk+-2.0-devel +BuildRequires: gtk+-2.0-devel %else -# BuildRequires: gtk+-devel >= 1.2.0 +BuildRequires: gtk+-devel >= 1.2.0 %endif BuildRequires: zlib-devel, libjpeg-devel, libpng-devel, libtiff-devel @@ -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} \ @@ -213,24 +186,24 @@ cd obj-static %endif --disable-shared \ %if %{unicode} - --enable-unicode \ + --enable-unicode \ %else - --disable-unicode \ + --disable-unicode \ --with-odbc \ %endif - --with-opengl + --with-opengl $MAKE 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 @@ -248,9 +221,10 @@ wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h +wx/convauto.h wx/containr.h +wx/cpp.h wx/datetime.h -wx/datetime.inl wx/datstrm.h wx/dde.h wx/debug.h @@ -287,6 +261,7 @@ wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h +wx/link.h wx/list.h wx/listimpl.cpp wx/log.h @@ -301,8 +276,11 @@ 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 +wx/recguard.h wx/regex.h wx/scopeguard.h wx/snglinst.h @@ -338,6 +316,14 @@ wx/xti.h wx/xtistrm.h wx/zipstrm.h wx/zstream.h +wx/unix/apptbase.h +wx/unix/apptrait.h +wx/unix/execute.h +wx/unix/mimetype.h +wx/unix/pipe.h +wx/unix/private.h +wx/unix/stackwalk.h +wx/unix/stdpaths.h wx/fs_inet.h wx/gsocket.h wx/protocol/file.h @@ -349,19 +335,12 @@ wx/sckipc.h wx/sckstrm.h wx/socket.h wx/url.h +wx/unix/gsockunx.h wx/xml/xml.h wx/xtixml.h wx/db.h wx/dbkeyg.h wx/dbtable.h -wx/unix/apptbase.h -wx/unix/apptrait.h -wx/unix/execute.h -wx/unix/gsockunx.h -wx/unix/mimetype.h -wx/unix/pipe.h -wx/unix/stackwalk.h -wx/unix/stdpaths.h EOF # --- wxBase headers list ends here --- cat <wxbase-headers.paths @@ -380,8 +359,8 @@ 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/datetime.inl %{_includedir}/wx-%{ver2}/wx/datstrm.h %{_includedir}/wx-%{ver2}/wx/dde.h %{_includedir}/wx-%{ver2}/wx/debug.h @@ -418,6 +397,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 @@ -432,8 +412,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 @@ -491,6 +473,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 @@ -509,8 +492,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 @@ -578,42 +567,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/*/*/* +%{_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} @@ -635,11 +629,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) @@ -658,6 +649,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