X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0edf099e29bd34ede3d83c1353cc35a0d8e43ca5..32485259c1342115488d219776dfebeb3d4d81b1:/wxGTK_RR.spec?ds=sidebyside diff --git a/wxGTK_RR.spec b/wxGTK_RR.spec index 02b78d9b64..904896be43 100644 --- a/wxGTK_RR.spec +++ b/wxGTK_RR.spec @@ -1,7 +1,7 @@ -%define pref /opt/gnome -%define ver 2.6.0 +%define _prefix /opt/gnome +%define ver 2.6.2 %define ver2 2.6 -%define rel 0 +%define rel 1 # Configurable settings (use --with(out) {unicode,gtk2} on rpmbuild cmd line): %define unicode 1 @@ -19,7 +19,7 @@ %if %{unicode} %define buildname gtk2u %else - %define buildname gtk2u + %define buildname gtk2 %endif %else %define gtkver 1.2 @@ -33,7 +33,7 @@ %define wxconfigstatic %{portname}-unicode-release-static-%{ver2} %define wxconfiglink wx%{portname}u-%{ver2}-config %else - %define name wx-%{portname} + %define name wx-%{portname}-ansi %define wxconfig %{portname}-ansi-release-%{ver2} %define wxconfigstatic %{portname}-ansi-release-static-%{ver2} %define wxconfiglink wx%{portname}-%{ver2}-config @@ -60,7 +60,7 @@ Group: X11/Libraries Source: wxGTK-%{ver}.tar.gz URL: http://www.wxwidgets.org Packager: Vadim Zeitlin -Prefix: %{pref} +Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root Requires: %{wxbasename} = %{ver} %if %{portname} == gtk2 @@ -82,6 +82,13 @@ wxWidgets is a free C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. +%package -n wx-i18n +Summary: The translations for the wxWidgets library. +Group: X11/Libraries + +%description -n wx-i18n +The translations files for the wxWidgets library. + %package devel Summary: The GTK+ %{gtkver} port of the wxWidgets library Group: X11/Libraries @@ -112,7 +119,7 @@ lists, arrays), portable wrappers around many OS-specific funstions (file operations, time/date manipulations, threads, processes, sockets, shared library loading) as well as other utility classes (streams, archive and compression). wxBase currently supports Win32, most Unix variants (Linux, -FreeBSD, Solaris, HP-UX) and MacOS X 10.3. +FreeBSD, Solaris, HP-UX) and MacOS X (Carbon and Mach-0). %package -n %{wxbasename}-devel Summary: wxBase library, header files. @@ -152,9 +159,8 @@ fi mkdir obj-shared-no-gui cd obj-shared-no-gui -../configure --prefix=%{pref} \ +../configure --prefix=%{_prefix} \ --disable-gui \ - --disable-optimise \ %if %{unicode} --enable-unicode %else @@ -165,17 +171,17 @@ cd .. mkdir obj-shared cd obj-shared -../configure --prefix=%{pref} \ +../configure --prefix=%{_prefix} \ %if ! %{gtk2} - --with-gtk1 \ + --with-gtk=1 \ %else - --with-gtk2 \ + --with-gtk=2 \ %endif - --disable-optimise \ %if %{unicode} --enable-unicode \ %else --disable-unicode \ + --with-odbc \ %endif --with-opengl $MAKE @@ -186,10 +192,9 @@ cd ../../.. mkdir obj-static-no-gui cd obj-static-no-gui -../configure --prefix=%{pref} \ +../configure --prefix=%{_prefix} \ --disable-gui \ --disable-shared \ - --disable-optimise \ %if %{unicode} --enable-unicode %else @@ -200,18 +205,18 @@ cd .. mkdir obj-static cd obj-static -../configure --prefix=%{pref} \ +../configure --prefix=%{_prefix} \ %if ! %{gtk2} - --with-gtk1 \ + --with-gtk=1 \ %else - --with-gtk2 \ + --with-gtk=2 \ %endif --disable-shared \ - --disable-optimise \ %if %{unicode} --enable-unicode \ %else --disable-unicode \ + --with-odbc \ %endif --with-opengl $MAKE @@ -222,10 +227,10 @@ cd ../../.. %install rm -rf $RPM_BUILD_ROOT -(cd obj-static-no-gui; make prefix=$RPM_BUILD_ROOT/usr install) -(cd obj-static; make prefix=$RPM_BUILD_ROOT/usr install) -(cd obj-shared-no-gui; make prefix=$RPM_BUILD_ROOT/usr install) -(cd obj-shared; make prefix=$RPM_BUILD_ROOT/usr install) +(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) # --- wxBase headers list begins here --- cat <wxbase-headers.files @@ -245,7 +250,6 @@ wx/confbase.h wx/config.h wx/containr.h wx/datetime.h -wx/datetime.inl wx/datstrm.h wx/dde.h wx/debug.h @@ -349,6 +353,14 @@ 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 @@ -472,6 +484,14 @@ cat <wxbase-headers.paths %{_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/stackwalk.h +%{_includedir}/wx-%{ver2}/wx/unix/stdpaths.h EOF # --- wxBase headers list ends here --- @@ -488,8 +508,8 @@ 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 prefix=$RPM_BUILD_ROOT/usr install) -(cd obj-shared/utils/wxrc; make prefix=$RPM_BUILD_ROOT/usr install) +(cd obj-shared/contrib/src; make DESTDIR=$RPM_BUILD_ROOT install) +(cd obj-shared/utils/wxrc; make DESTDIR=$RPM_BUILD_ROOT install) %clean rm -rf $RPM_BUILD_ROOT @@ -513,13 +533,9 @@ ln -sf %{_libdir}/wx/config/%{wxconfig} %{_bindir}/%{wxconfiglink} /sbin/ldconfig %preun devel -if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then - SUM1=`md5sum %{_libdir}/wx/config/%{wxconfig} | cut -c 0-32` - SUM2=`md5sum %{_bindir}/wx-config | cut -c 0-32` - if test "x$SUM1" = "x$SUM2" ; then - rm -f %{_bindir}/wx-config - fi -fi +%if %{unicode} + rm -f %{_bindir}/wx-config +%endif rm -f %{_bindir}/%{wxconfiglink} %post -n %{wxbasename} @@ -570,6 +586,9 @@ rm -f %{_bindir}/%{wxbaseconfiglink} %{_libdir}/libwx_%{buildname}_qa-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_xrc-%{ver2}.so.* +%files -n wx-i18n +%defattr(-,root,root) +%{_datadir}/locale/*/*/* %files devel -f core-headers.files %defattr(-,root,root) @@ -605,7 +624,6 @@ rm -f %{_bindir}/%{wxbaseconfiglink} %files -n %{wxbasename} %defattr(-,root,root) %{_libdir}/libwx_base*-%{ver2}.so.* -#%{_datadir}/locale/*/*/* %files -n %{wxbasename}-devel -f wxbase-headers.paths %defattr (-,root,root)