Upport latest changes from 2_8 branch (print dialog

[wxWidgets.git] / wxPython / distrib / wxPythonFull.spec.in

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index a05cd0b4d75f2bac10c345b4dfe5f3b3ae841606..8d86737c7a8051c00738ce9891d4af8d390fec7d 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -79,7 +79,7 @@
 # its use eventhough there is a compatibility problem that causes a
 # failed compile.
 %if %{?mediactrl:0}%{!?mediactrl:1}
-%define mediactrl 0
+%define mediactrl 1
 %endif
 
 
@@ -111,7 +111,7 @@ Name:      %{pkgname}%{ver2}
 Summary:   Cross platform GUI toolkit for Python
 Version:   %{version}
 Release:   %{release}
-Source0:   %{tarname}-%{version}.tar.gz
+Source0:   %{tarname}-%{version}.tar.bz2
 License:   wx Library Licence, Version 3
 URL:       http://wxPython.org/
 Packager:  Robin Dunn <robin@alldunn.com>
@@ -205,11 +205,12 @@ cd bld
        --with-gtk=2 \
 %endif
        --prefix=%{wxpref} \
-       --enable-monolithic \
+       --disable-monolithic \
        --disable-rpath \
        --with-opengl \
        --with-gnomeprint \
        --enable-geometry \
+       --enable-graphics_ctx \
        --enable-optimise \
        --enable-sound  --with-sdl \
 %if %{mediactrl}
@@ -234,7 +235,6 @@ cd bld
 
 
 make 
-make -C contrib/src/animate 
 make -C contrib/src/gizmos 
 make -C contrib/src/stc
 
@@ -262,7 +262,6 @@ WXDIR=`pwd`
 # Install wxGTK and contribs
 cd bld
 make prefix=$RPM_BUILD_ROOT%{wxpref} install
-make -C contrib/src/animate prefix=$RPM_BUILD_ROOT%{wxpref} install
 make -C contrib/src/gizmos prefix=$RPM_BUILD_ROOT%{wxpref} install
 make -C contrib/src/stc prefix=$RPM_BUILD_ROOT%{wxpref} install
 
@@ -414,9 +413,13 @@ rm %{wxpref}/bin/wx-config
 %doc wxPython/docs/*
 %dir %{pref}/lib*/python%{pyver}/site-packages/wx-%{ver2}*-%{port}-%{chartype}
 %{pref}/lib*/python%{pyver}/site-packages/wx-%{ver2}*-%{port}-%{chartype}/*
+%dir %{pref}/lib*/python%{pyver}/site-packages/wxaddons
+%{pref}/lib*/python%{pyver}/site-packages/wxaddons/*
 %dir %{wxpref}
 %dir %{wxpref}/lib
-%{wxpref}/lib/libwx_gtk*
+%{wxpref}/lib/libwx_*
+%dir %{wxpref}/bin
+%{wxpref}/bin/wxrc*
 %{wxpref}/share