update from herbert breunung

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

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index d86b656cbce6fe4a9254e8733dd0265a5776e859..82a9a5ab5386678d52ce33ae6d79c12f662eb339 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -22,7 +22,9 @@
 # Should --enable-debug_flag be used in release builds?  Using it
 # defines __WXDEBUG__ and gives us runtime diagnostics that are turned
 # into Python exceptions starting with 2.3.4.  (So turning it on is a
 # Should --enable-debug_flag be used in release builds?  Using it
 # defines __WXDEBUG__ and gives us runtime diagnostics that are turned
 # into Python exceptions starting with 2.3.4.  (So turning it on is a

-# very helpful thing IMO and is recommended.)
+# very helpful thing IMO and is recommended.)  The code is still
+# compiled with optimization flags and such when this option is used,
+# it simply turns on some extra code.

 %define debug_flag 1
 
 
 %define debug_flag 1
 
 


@@ -135,9 +137,8 @@ cd $WXDIR/wxPython
        NO_SCRIPTS=1 \
        WXPORT=%{lcport} \
        UNICODE=%{unicode} \
        NO_SCRIPTS=1 \
        WXPORT=%{lcport} \
        UNICODE=%{unicode} \

-       WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \
-       CONTRIBS_INC="$WXDIR/contrib/include" \
-       build
+       WX_CONFIG="$WXDIR/bld/wx-config --inplace" \
+               build

 
 
 # Build wxrc (XRC resource tool)
 
 
 # Build wxrc (XRC resource tool)


@@ -173,11 +174,6 @@ cd $WXDIR/wxPython
 
 cd $WXDIR/wxPython
 
 
 cd $WXDIR/wxPython
 

-# install the wxPython headers
-cp -R include $RPM_BUILD_ROOT%{wxpref}
-mkdir -p $RPM_BUILD_ROOT%{wxpref}/include/wx/wxPython/i_files
-cp src/*.i $RPM_BUILD_ROOT%{wxpref}/include/wx/wxPython/i_files
-

 
 # Since I want this RPM to be as generic as possible I won't let
 # distutils copy the scripts (NO_SCRIPTS=1 above) since it will mangle
 
 # Since I want this RPM to be as generic as possible I won't let
 # distutils copy the scripts (NO_SCRIPTS=1 above) since it will mangle