added missing comma

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

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index a64c7ac5408e14cf0412253f0a0bac8c8b79aeb9..cc1ccfedd136aa6c6c10ac479c3028d5896d0c9b 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
 
 


@@ -42,7 +44,7 @@ Name:      %{name}
 Version:   %{version}
 Release:   %{release}
 Source0:   %{tarname}-%{version}.tar.gz
 Version:   %{version}
 Release:   %{release}
 Source0:   %{tarname}-%{version}.tar.gz

-License:   wxWindows Library Licence, Version 3
+License:   wx Library Licence, Version 3

 URL:       http://wxPython.org/
 Packager:  Robin Dunn <robin@alldunn.com>
 Group:     Development/Python
 URL:       http://wxPython.org/
 Packager:  Robin Dunn <robin@alldunn.com>
 Group:     Development/Python


@@ -64,11 +66,11 @@ Obsoletes: wxPython wxPython%{port}
 
 %description
 wxPython is a GUI toolkit for Python that is a wrapper around the
 
 %description
 wxPython is a GUI toolkit for Python that is a wrapper around the

-wxWindows C++ GUI library.  wxPython provides a large variety of
+wxWidgets C++ GUI library.  wxPython provides a large variety of

 window types and controls, all implemented with a native look and feel
 (and native runtime speed) on the platforms it is supported on.
 
 window types and controls, all implemented with a native look and feel
 (and native runtime speed) on the platforms it is supported on.
 

-This package is implemented using the %{port} port of wxWindows, and
+This package is implemented using the %{port} port of wxWidgets, and

 includes the wx%{port} shared libs and etc.
 
 
 includes the wx%{port} shared libs and etc.
 
 


@@ -121,7 +123,7 @@ cd bld
 %endif
 
 
 %endif
 
 

-# Build wxWindows and some contrib libs
+# Build wxWidgets and some contrib libs

 make 
 make -C contrib/src/gizmos 
 make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
 make 
 make -C contrib/src/gizmos 
 make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"


@@ -129,14 +131,6 @@ make -C contrib/src/stc
 make -C contrib/src/xrc
 
 
 make -C contrib/src/xrc
 
 

-# # Link the contrib header directories in place so we can build all of
-# # wxPython without installing wxWindows
-# if [ ! -e $WXDIR/include/wx/gizmos ]; then
-#      cd $WXDIR/include/wx
-#      ln -s ../../contrib/include/wx/* .
-# fi
-
-

 # Now build wxPython
 cd $WXDIR/wxPython
 %{python} setup.py \
 # Now build wxPython
 cd $WXDIR/wxPython
 %{python} setup.py \


@@ -144,7 +138,7 @@ cd $WXDIR/wxPython
        WXPORT=%{lcport} \
        UNICODE=%{unicode} \
        WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \
        WXPORT=%{lcport} \
        UNICODE=%{unicode} \
        WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \

-       CONTRIBS_INC="$WXDIR/include" \
+       CONTRIBS_INC="$WXDIR/contrib/include" \

        build
 
 
        build
 
 


@@ -160,8 +154,7 @@ strip wxrc
 WXDIR=`pwd`
 cd bld
 
 WXDIR=`pwd`
 cd bld
 

-# Install wxWindows and the contribs so the wxPython build can find
-# all the headers it needs
+# Install wxWidgets and the contribs

 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 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


@@ -180,14 +173,8 @@ cd $WXDIR/wxPython
        --root=$RPM_BUILD_ROOT
 
 
        --root=$RPM_BUILD_ROOT
 
 

-

 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