Merge recent changes from 2.8 branch.

Make updates for recent changes on CVS HEAD.
Remove or workaround deprecated items.
Fix compile errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-03-27 01:49:46 +00:00
parent fd4081aa33
commit cbfc9df676
131 changed files with 12811 additions and 4397 deletions

View File

@@ -3,6 +3,7 @@
# Build an RPM containing both wxGTK and wxPython
##set -o xtrace
##set -o errexit
spectemplate=distrib/wxPythonFull.spec.in
@@ -236,7 +237,7 @@ fi
#----------------------------------------------------------------------
# build the RPM
if [ -z "${skiprpm}" ]; then
if [ "${skiprpm}" != "1" ]; then
echo "*** Building RPMs..."
cp ${distdir}/${tarver}.tar.bz2 ${rpmtop}/SOURCES