Fix compile error

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

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 9473e27f74b43e505977b7aea91f13333d1a83af..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}
 # 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
 
 
 %endif
 
 


@@ -205,11 +205,12 @@ cd bld
        --with-gtk=2 \
 %endif
        --prefix=%{wxpref} \
        --with-gtk=2 \
 %endif
        --prefix=%{wxpref} \

-       --enable-monolithic \
+       --disable-monolithic \

        --disable-rpath \
        --with-opengl \
        --with-gnomeprint \
        --enable-geometry \
        --disable-rpath \
        --with-opengl \
        --with-gnomeprint \
        --enable-geometry \

+       --enable-graphics_ctx \

        --enable-optimise \
        --enable-sound  --with-sdl \
 %if %{mediactrl}
        --enable-optimise \
        --enable-sound  --with-sdl \
 %if %{mediactrl}


@@ -234,7 +235,6 @@ cd bld
 
 
 make 
 
 
 make 

-make -C contrib/src/animate 

 make -C contrib/src/gizmos 
 make -C contrib/src/stc
 
 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
 # 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
 
 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}/*
 %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
 %dir %{wxpref}
 %dir %{wxpref}/lib

-%{wxpref}/lib/libwx_gtk*
+%{wxpref}/lib/libwx_*
+%dir %{wxpref}/bin
+%{wxpref}/bin/wxrc*

 %{wxpref}/share
 
 
 %{wxpref}/share