X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97ddaeee9eb6d5568d2f7c9e7b5a19deb9c7dd0f..eddcc4b442fdfeabf0c317d15663cf09c9888d56:/wxGTK.spec?ds=sidebyside diff --git a/wxGTK.spec b/wxGTK.spec index 904896be43..3201cb8f96 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,6 +1,6 @@ -%define _prefix /opt/gnome -%define ver 2.6.2 -%define ver2 2.6 +%define _prefix /usr +%define ver 2.9.1 +%define ver2 2.9 %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} \ @@ -181,7 +167,6 @@ cd obj-shared --enable-unicode \ %else --disable-unicode \ - --with-odbc \ %endif --with-opengl $MAKE @@ -190,19 +175,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,42 +185,50 @@ cd obj-static %endif --disable-shared \ %if %{unicode} - --enable-unicode \ + --enable-unicode \ %else - --disable-unicode \ - --with-odbc \ + --disable-unicode \ %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 wx/afterstd.h +wx/anystr.h wx/app.h wx/apptrait.h wx/archive.h wx/arrimpl.cpp wx/arrstr.h +wx/atomic.h +wx/base64.h wx/beforestd.h wx/buffer.h wx/build.h +wx/chartype.h +wx/checkeddelete.h wx/chkconf.h wx/clntdata.h +wx/cmdargs.h wx/cmdline.h wx/confbase.h wx/config.h +wx/convauto.h wx/containr.h +wx/cpp.h +wx/crt.h wx/datetime.h wx/datstrm.h wx/dde.h @@ -256,6 +236,7 @@ wx/debug.h wx/defs.h wx/dir.h wx/dlimpexp.h +wx/dlist.h wx/dynarray.h wx/dynlib.h wx/dynload.h @@ -263,6 +244,7 @@ wx/encconv.h wx/event.h wx/except.h wx/features.h +wx/flags.h wx/ffile.h wx/file.h wx/fileconf.h @@ -271,6 +253,8 @@ wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h +wx/fs_arc.h +wx/fs_filter.h wx/fs_mem.h wx/fs_zip.h wx/hash.h @@ -284,8 +268,8 @@ wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h -wx/isql.h -wx/isqlext.h +wx/kbdstate.h +wx/link.h wx/list.h wx/listimpl.cpp wx/log.h @@ -296,52 +280,89 @@ wx/memory.h wx/memtext.h wx/mimetype.h wx/module.h +wx/mousestate.h 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/ptr_shrd.h +wx/recguard.h wx/regex.h +wx/scopedarray.h +wx/scopedptr.h wx/scopeguard.h +wx/sharedptr.h wx/snglinst.h wx/sstream.h wx/stack.h wx/stackwalk.h wx/stdpaths.h +wx/stdstream.h wx/stockitem.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h +wx/stringimpl.h +wx/stringops.h +wx/strvararg.h wx/sysopt.h +wx/tarstrm.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/timer.h +wx/tls.h wx/tokenzr.h +wx/tracker.h wx/txtstrm.h wx/types.h +wx/unichar.h wx/uri.h +wx/ustring.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h +wx/weakref.h wx/wfstream.h wx/wx.h wx/wxchar.h +wx/wxcrt.h +wx/wxcrtbase.h +wx/wxcrtvararg.h wx/wxprec.h +wx/xlocale.h wx/xti.h wx/xtistrm.h wx/zipstrm.h wx/zstream.h +wx/meta/convertible.h +wx/meta/if.h +wx/meta/int2type.h +wx/meta/movable.h +wx/unix/app.h +wx/unix/apptbase.h +wx/unix/apptrait.h +wx/unix/chkconf.h +wx/unix/evtloop.h +wx/unix/pipe.h +wx/unix/stdpaths.h +wx/unix/stackwalk.h +wx/unix/tls.h +wx/unix/execute.h +wx/unix/mimetype.h wx/fs_inet.h -wx/gsocket.h wx/protocol/file.h wx/protocol/ftp.h wx/protocol/http.h +wx/protocol/log.h wx/protocol/protocol.h wx/sckaddr.h wx/sckipc.h @@ -350,17 +371,6 @@ wx/socket.h wx/url.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 @@ -379,8 +389,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 @@ -417,6 +427,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 @@ -431,8 +442,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 @@ -481,15 +494,13 @@ cat <wxbase-headers.paths %{_includedir}/wx-%{ver2}/wx/url.h %{_includedir}/wx-%{ver2}/wx/xml/xml.h %{_includedir}/wx-%{ver2}/wx/xtixml.h -%{_includedir}/wx-%{ver2}/wx/db.h -%{_includedir}/wx-%{ver2}/wx/dbkeyg.h -%{_includedir}/wx-%{ver2}/wx/dbtable.h %{_includedir}/wx-%{ver2}/wx/unix/apptbase.h %{_includedir}/wx-%{ver2}/wx/unix/apptrait.h %{_includedir}/wx-%{ver2}/wx/unix/execute.h %{_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 @@ -508,8 +519,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 @@ -577,42 +594,38 @@ 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} @@ -634,11 +647,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) @@ -657,6 +667,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