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 198b24a2438df6ca34cee46d8d3a93c355e502c5..8d86737c7a8051c00738ce9891d4af8d390fec7d 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -16,9 +16,9 @@
 
 
 # Which version of Python to build with.  Used to assemble python
-# binary name so use '2.2', '2.3', etc.
+# binary name so use '2.3', '2.4', etc.
 %if %{?pyver:0}%{!?pyver:1}
-%define pyver 2.3
+%define pyver 2.4
 %endif
 
 
@@ -58,13 +58,30 @@
 
 
 # Used to set the Release tag below.  I normally use it to define what
-# distro the RPM was build on and also include the version of Python
+# distro the RPM was built on and also include the version of Python
 # it was built with.  
 %if %{?release:0}%{!?release:1}
 %define release 1_py%{pyver}
 %endif
 
 
+# This one is used to control whether the full 4 components of the
+# verseion number are used in the site-packages subdirectory name.  By
+# default only 2 or 3 components (depending on stable/unstable status)
+# are used.
+%if %{?fullver:0}%{!?fullver:1}
+%define fullver 0
+%endif
+
+
+# Whether to add --enable-mediactrl to the wxWidgets configure.  For
+# some older versions of gstreamer-0.8 it currently incorerctly allows
+# its use eventhough there is a compatibility problem that causes a
+# failed compile.
+%if %{?mediactrl:0}%{!?mediactrl:1}
+%define mediactrl 1
+%endif
+
 
 #----------------------------------------------------------------------
 # Other variables used below
@@ -94,7 +111,7 @@ Name:      %{pkgname}%{ver2}
 Summary:   Cross platform GUI toolkit for Python
 Version:   %{version}
 Release:   %{release}
-Source0:   %{tarname}-%{version}.tar.gz
+Source0:   %{tarname}-%{version}.tar.bz2
 License:   wx Library Licence, Version 3
 URL:       http://wxPython.org/
 Packager:  Robin Dunn <robin@alldunn.com>
@@ -112,13 +129,13 @@ Cross platform GUI toolkit for Python
 Summary:   Cross platform GUI toolkit for Python
 Group:     Development/Python
 Requires:  %{pkgname}-common
-Obsoletes: wxPythonGTK%{gtktype}-py%{pyver}
+Obsoletes: wxPythonGTK%{gtktype}-py%{pyver}, wxPythonGTK%{gtktype}
 Provides:  wxPython
 
 
 %description -n %{pkgname}%{ver2}-%{port}-%{chartype}
 wxPython is a GUI toolkit for the Python programming language. It
- allows Python programmers to create programs with a robust, highly
+allows Python programmers to create programs with a robust, highly
 functional graphical user interface, simply and easily. It is
 implemented as a Python extension module (native code) that wraps the
 popular wxWidgets cross platform GUI library, which is written in C++.
@@ -181,22 +198,29 @@ WXDIR=`pwd`
 # Configure and build wxWidgets
 mkdir bld
 cd bld
-../configure --with-gtk \
+../configure \
+%if %{using_gtk1}
+       --with-gtk=1 \
+%else 
+       --with-gtk=2 \
+%endif
        --prefix=%{wxpref} \
-       --enable-monolithic \
+       --disable-monolithic \
        --disable-rpath \
        --with-opengl \
+       --with-gnomeprint \
        --enable-geometry \
+       --enable-graphics_ctx \
        --enable-optimise \
        --enable-sound  --with-sdl \
-       --enable-display \
-%if %{using_gtk1}
-       --disable-gtk2 \
-%else 
-       --enable-gtk2 \
+%if %{mediactrl}
+       --enable-mediactrl \
 %endif
+       --enable-display \
 %if %{unicode}
        --enable-unicode \
+%else
+       --disable-unicode \
 %endif
 %if %{debug_flag}
        --enable-debug_flag \
@@ -212,7 +236,6 @@ cd bld
 
 make 
 make -C contrib/src/gizmos 
-##make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
 make -C contrib/src/stc
 
 
@@ -223,6 +246,7 @@ cd $WXDIR/wxPython
        WXPORT=%{port} \
        UNICODE=%{unicode} \
        EP_ADD_OPTS=1 \
+       EP_FULL_VER=%{fullver} \
        NO_SCRIPTS=1 \
        WX_CONFIG="$WXDIR/bld/wx-config --no_rpath" \
                build_ext --rpath=%{wxpref}/lib \
@@ -239,7 +263,6 @@ 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/stc prefix=$RPM_BUILD_ROOT%{wxpref} install
 
 
@@ -250,6 +273,7 @@ cd $WXDIR/wxPython
        WXPORT=%{port} \
        UNICODE=%{unicode} \
        EP_ADD_OPTS=1 \
+       EP_FULL_VER=%{fullver} \
        NO_SCRIPTS=1 \
        WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref} --no_rpath" \
                build_ext --rpath=%{wxpref}/lib \
@@ -389,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}/*
+%dir %{pref}/lib*/python%{pyver}/site-packages/wxaddons
+%{pref}/lib*/python%{pyver}/site-packages/wxaddons/*
 %dir %{wxpref}
 %dir %{wxpref}/lib
-%{wxpref}/lib/libwx_gtk*
+%{wxpref}/lib/libwx_*
+%dir %{wxpref}/bin
+%{wxpref}/bin/wxrc*
 %{wxpref}/share