fix TestGLCanvas ctor (part of patch 1155132)

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

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 0c4e78f1634f273327fc84db85cfffb0d1cca268..198b24a2438df6ca34cee46d8d3a93c355e502c5 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -184,7 +184,7 @@ cd bld
 ../configure --with-gtk \
        --prefix=%{wxpref} \
        --enable-monolithic \
-       --enable-rpath=%{wxpref}/lib \
+       --disable-rpath \
        --with-opengl \
        --enable-geometry \
        --enable-optimise \
@@ -201,6 +201,7 @@ cd bld
 %if %{debug_flag}
        --enable-debug_flag \
 %endif
+       --disable-debugreport \
 %if %{builtin_libs}
        --with-libjpeg=builtin \
        --with-libpng=builtin \
@@ -211,7 +212,7 @@ cd bld
 
 make 
 make -C contrib/src/gizmos 
-make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
+##make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
 make -C contrib/src/stc
 
 
@@ -223,8 +224,9 @@ cd $WXDIR/wxPython
        UNICODE=%{unicode} \
        EP_ADD_OPTS=1 \
        NO_SCRIPTS=1 \
-       WX_CONFIG="$WXDIR/bld/wx-config --inplace" \
-               build
+       WX_CONFIG="$WXDIR/bld/wx-config --no_rpath" \
+               build_ext --rpath=%{wxpref}/lib \
+       build
 
 
 
@@ -237,7 +239,7 @@ WXDIR=`pwd`
 cd bld
 make prefix=$RPM_BUILD_ROOT%{wxpref} install
 make -C contrib/src/gizmos prefix=$RPM_BUILD_ROOT%{wxpref} install
-make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$RPM_BUILD_ROOT%{wxpref} install
+##make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$RPM_BUILD_ROOT%{wxpref} install
 make -C contrib/src/stc prefix=$RPM_BUILD_ROOT%{wxpref} install
 
 
@@ -249,7 +251,8 @@ cd $WXDIR/wxPython
        UNICODE=%{unicode} \
        EP_ADD_OPTS=1 \
        NO_SCRIPTS=1 \
-       WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
+       WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref} --no_rpath" \
+               build_ext --rpath=%{wxpref}/lib \
        install \
        --root=$RPM_BUILD_ROOT