X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8da2fe32f997a122a07135d87423105f80039f15..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/wxPython/distrib/wxPythonFull.spec.in

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 198b24a243..898695b763 100644
--- 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
 
 
@@ -112,7 +112,7 @@ 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
 
 
@@ -181,22 +181,25 @@ 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-rpath \
 	--with-opengl \
+	--with-gnomeprint \
 	--enable-geometry \
 	--enable-optimise \
 	--enable-sound 	--with-sdl \
 	--enable-display \
-%if %{using_gtk1}
-	--disable-gtk2 \
-%else 
-	--enable-gtk2 \
-%endif
 %if %{unicode}
 	--enable-unicode \
+%else
+	--disable-unicode \
 %endif
 %if %{debug_flag}
 	--enable-debug_flag \
@@ -211,8 +214,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
 
 
@@ -238,8 +241,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