Easy fix for automated uploads (I thought I tried this and it failed, but fortunately...

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

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index e81db5091cde12876bef12543f61f6c9b1bd20f4..a05cd0b4d75f2bac10c345b4dfe5f3b3ae841606 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -15,15 +15,14 @@
 # the default value set here will be used instead.
 
 
-# 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
-# it was built with.  
-%if %{?release:0}%{!?release:1}
-%define release 1_py%{pyver}
+# Which version of Python to build with.  Used to assemble python
+# binary name so use '2.3', '2.4', etc.
+%if %{?pyver:0}%{!?pyver:1}
+%define pyver 2.4
 %endif
 
 
-# Which wxWidgets port to build and use.  Current acceptable valuse
+# Which wxWidgets port to build and use.  Current acceptable values
 # are 'gtk' and 'gtk2'.
 %if %{?port:0}%{!?port:1}
 %define port gtk2
@@ -36,14 +35,6 @@
 %define unicode 1
 %endif
 
-# Which version of Python to build with.  Used to assemble python
-# binary name so use '2.2', '2.3', etc.
-%if %{?pyver:0}%{!?pyver:1}
-%define pyver 2.3
-%endif
-
-
-
 
 # Should the builtin image and etc. libs be used, or system libs?
 # Distro specific RPMs should probably set this to 0, generic ones
@@ -66,6 +57,32 @@
 %endif
 
 
+# Used to set the Release tag below.  I normally use it to define what
+# 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 0
+%endif
+
+
 #----------------------------------------------------------------------
 # Other variables used below
 
@@ -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,26 +198,33 @@ 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 \
-       --enable-rpath=%{wxpref}/lib \
+       --disable-rpath \
        --with-opengl \
+       --with-gnomeprint \
        --enable-geometry \
        --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 \
 %endif
+       --disable-debugreport \
 %if %{builtin_libs}
        --with-libjpeg=builtin \
        --with-libpng=builtin \
@@ -210,8 +234,8 @@ cd bld
 
 
 make 
+make -C contrib/src/animate 
 make -C contrib/src/gizmos 
-make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
 make -C contrib/src/stc
 
 
@@ -222,9 +246,11 @@ cd $WXDIR/wxPython
        WXPORT=%{port} \
        UNICODE=%{unicode} \
        EP_ADD_OPTS=1 \
+       EP_FULL_VER=%{fullver} \
        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
 
 
 
@@ -236,8 +262,8 @@ WXDIR=`pwd`
 # Install wxGTK and contribs
 cd bld
 make prefix=$RPM_BUILD_ROOT%{wxpref} install
+make -C contrib/src/animate 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
 
 
@@ -248,8 +274,10 @@ 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}" \
+       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