another compilation fix for after last check in

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

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


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


@@ -108,6 +110,8 @@ cd bld
 %endif
        --enable-geometry \
        --enable-optimise \
 %endif
        --enable-geometry \
        --enable-optimise \

+       --enable-sound  --with-sdl \
+       --enable-display \

 %if %{debug_flag}
        --enable-debug_flag \
 %endif
 %if %{debug_flag}
        --enable-debug_flag \
 %endif


@@ -119,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"


@@ -127,25 +131,15 @@ make -C contrib/src/stc
 make -C contrib/src/xrc
 
 
 make -C contrib/src/xrc
 
 

-# Install wxWindows and the contribs so the wxPython build can find
-# all the headers it needs
-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/stc prefix=$RPM_BUILD_ROOT%{wxpref} install
-make -C contrib/src/xrc prefix=$RPM_BUILD_ROOT%{wxpref} install
-
-

 # Now build wxPython
 cd $WXDIR/wxPython
 %{python} setup.py \
        NO_SCRIPTS=1 \
        WXPORT=%{lcport} \
        UNICODE=%{unicode} \
 # Now build wxPython
 cd $WXDIR/wxPython
 %{python} setup.py \
        NO_SCRIPTS=1 \
        WXPORT=%{lcport} \
        UNICODE=%{unicode} \

-       WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
-       build
+       WX_CONFIG="$WXDIR/bld/wx-config --inplace" \
+               build

 
 

-## $WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" 

 
 # Build wxrc (XRC resource tool)
 cd $WXDIR/bld/contrib/utils/wxrc
 
 # Build wxrc (XRC resource tool)
 cd $WXDIR/bld/contrib/utils/wxrc


@@ -153,6 +147,20 @@ make
 strip wxrc
 
 
 strip wxrc
 
 

+#----------------------------------------------------------------
+%install
+
+WXDIR=`pwd`
+cd bld
+
+# 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 -C contrib/src/stc prefix=$RPM_BUILD_ROOT%{wxpref} install
+make -C contrib/src/xrc prefix=$RPM_BUILD_ROOT%{wxpref} install
+
+

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


@@ -164,18 +172,8 @@ cd $WXDIR/wxPython
        --root=$RPM_BUILD_ROOT
 
 
        --root=$RPM_BUILD_ROOT
 
 

-#----------------------------------------------------------------
-%install
-
-# Other "install" tasks...
-WXDIR=`pwd`

 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


@@ -206,10 +204,6 @@ done
 cp $WXDIR/bld/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT%{pref}/bin
 
 
 cp $WXDIR/bld/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT%{pref}/bin
 
 

-# link specific name to generic name
-##ln -s wxPython-%{version} $RPM_BUILD_ROOT%{wxprefbase}
-
-

 # install KDE & GNOME menus
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Development
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 # install KDE & GNOME menus
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Development
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications


@@ -280,9 +274,7 @@ if [ -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
 
 
 %postun
 
 
 %postun

-if [ -e %{wxprefbase} ]; then
-       rm %{wxprefbase}
-fi
+rm -f %{wxprefbase}

 # This is done on Mandrake to update its menus:
 if [ "$1" = "0" -a -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
 
 # This is done on Mandrake to update its menus:
 if [ "$1" = "0" -a -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
 


@@ -300,6 +292,8 @@ if [ "$1" = "0" -a -x /usr/bin/update-menus ]; then /usr/bin/update-menus || tru
 %doc wxPython/docs/*
 %{_bindir}/*
 %{_libdir}/python%{pyver}/site-packages/*
 %doc wxPython/docs/*
 %{_bindir}/*
 %{_libdir}/python%{pyver}/site-packages/*

+%dir %{wxpref}
+%dir %{wxpref}/lib

 %{wxpref}/lib/libwx*
 %{wxpref}/share
 %{_datadir}/applnk/Development/*
 %{wxpref}/lib/libwx*
 %{wxpref}/share
 %{_datadir}/applnk/Development/*