A few build tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/distrib/all/build-sources b/wxPython/distrib/all/build-sources
index 22faacff51753a44c30204f2f11bed7913aecd05..a85d3bbef28f87ee483950de24a0f88f03bc1a9e 100755 (executable)
--- a/wxPython/distrib/all/build-sources
+++ b/wxPython/distrib/all/build-sources
@@ -9,7 +9,7 @@ set -o errexit
 if [ $skipsource != yes -o $onlysource = yes ]; then
 
     # make the source tarball and srpm
 if [ $skipsource != yes -o $onlysource = yes ]; then
 
     # make the source tarball and srpm

-    distrib/makerpm 2.3 srpm
+    distrib/makerpm 2.4 srpm

 
     # Copy everything to the staging dir
     echo "Moving stuff to $STAGING_DIR..."
 
     # Copy everything to the staging dir
     echo "Moving stuff to $STAGING_DIR..."

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index e4057e740f19933e84802de24cbc05f9738aab8f..898695b763eadc4e55ce3666f29599296b6b80e1 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
 
 
 # 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}
 %if %{?pyver:0}%{!?pyver:1}

-%define pyver 2.3
+%define pyver 2.4

 %endif
 
 
 %endif
 
 


@@ -112,7 +112,7 @@ Cross platform GUI toolkit for Python
 Summary:   Cross platform GUI toolkit for Python
 Group:     Development/Python
 Requires:  %{pkgname}-common
 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
 
 
 Provides:  wxPython
 
 

diff --git a/wxPython/docs/bin/everything b/wxPython/docs/bin/everything
index 80b896dff1132f7aeccb3517b2853475f5017d28..00fb4edda280a997399e428b51e31825489fa7e8 100755 (executable)
--- a/wxPython/docs/bin/everything
+++ b/wxPython/docs/bin/everything
@@ -1,10 +1,10 @@
 #!/bin/bash
 # note a real script yet, just a placeholder for ideas...
 
 #!/bin/bash
 # note a real script yet, just a placeholder for ideas...
 

-b 23 gtk2 t
-b 23 gtk2   BUILD_RENAMERS=0 PREP_ONLY=1 FULL_DOCS=1
+b 24 gtk2 t
+b 24 gtk2   BUILD_RENAMERS=0 PREP_ONLY=1 FULL_DOCS=1

 ##docs/bin/simplify.py
 docs/bin/makeapidocs
 ##docs/bin/simplify.py
 docs/bin/makeapidocs

-b 23 gtk2 t
-b 23 gtk2   BUILD_RENAMERS=0 PREP_ONLY=1
+b 24 gtk2 t
+b 24 gtk2   BUILD_RENAMERS=0 PREP_ONLY=1