Some fixes and cleanups

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

wxPython/distrib/makerpm

@@ -20,6 +20,7 @@ cvsroot=:pserver:anoncvs@cvs.wxwindows.org:/pack/cvsroots/wxwindows
 pythonbin=/usr/bin/python
 port=GTK
 lcport=gtk
+unicode=0
 tarname=wxPythonSrc
 
 
@@ -38,6 +39,7 @@ function useage {
     echo "   skiptar        Don't build the tarball"
     echo "   skiprpm        Don't build the RPM (but why?)"
     echo "   skipclean      Don't do the cleanup at the end"
+    echo "   gtk2           Build using wxGTK2 and Unicode"
     echo "   speconly       Do nothing but write the RPM spec file"
     echo "   smp            Add SMP=2 to the envivonment to speed wxGTK build"
 }
@@ -73,6 +75,7 @@ function makespec {
 	| sed s:@TARNAME@:${tarname}:g \
 	| sed s:@VERSION@:${version}:g \
 	| sed s:@VER2@:${ver2}:g \
+	| sed s:@UNICODE@:${unicode}:g \
 	> ${distdir}/wxPython${port}.spec
 }
 
@@ -80,12 +83,13 @@ function makespec {
 
 for flag in $*; do
     case ${flag} in
-	skipcvs)   skipcvs=1        ;;
-	skipclean) skipclean=1      ;;
-	skiptar)   skiptar=1        ;;
-	skiprpm)   skiprpm=1        ;;
-	smp)       export SMP=2     ;;
-	speconly)  makespec; exit 0 ;;
+	skipcvs)   skipcvs=1                           ;;
+	skipclean) skipclean=1                         ;;
+	skiptar)   skiptar=1                           ;;
+	skiprpm)   skiprpm=1                           ;;
+	gtk2)      unicode=1; port=GTK2; lcport=gtk2   ;;
+	smp)       export SMP=2                        ;;
+	speconly)  makespec; exit 0                    ;;
 
 	*)  echo "Unknown flag \"${flag}\""
 	    useage

wxPython/distrib/wxPythonFull.spec.in

@@ -3,6 +3,7 @@
 %define pyver 	@PYVER@
 %define port  	@PORT@
 %define lcport 	@LCPORT@
+%define unicode @UNICODE@
 %define tarname @TARNAME@
 %define version @VERSION@
 %define ver2    @VER2@
@@ -10,13 +11,16 @@
 %define wxpref  %{pref}/lib/wxPython
 %define name    wxPython%{port}-py%{pyver}
 
+# Should the builtin image and etc. libs be used, or system libs?
+# Distro specific RPMs should probably set this to 0, generic ones
+# should use 1
+%define builtin_libs 1
+
 # Should --enable-debug_flag be used in release builds?
 # Using it defines __WXDEBUG__ and gives us runtime diagnostics
 # that are turned into Python exceptions starting with 2.3.4.
 %define debug_flag 1
 
-
-
 %if %{debug_flag}
     %define wxconfigname %{wxpref}/bin/wx%{lcport}d-%{ver2}-config
 %else
@@ -91,16 +95,21 @@ $WXDIR/configure --with-%{lcport} \
 	--disable-soname \
 	--enable-rpath=%{wxpref}/lib \
 	--with-opengl \
+%if %{unicode}
+	--enable-gtk2 \
+	--enable-unicode \
+%endif
 	--enable-geometry \
 	--enable-optimise \
 %if %{debug_flag}
 	--enable-debug_flag \
 %endif
+%if %{builtin_libs}
 	--with-libjpeg=builtin \
 	--with-libpng=builtin \
 	--with-libtiff=builtin \
 	--with-zlib=builtin \
-
+%endif
 
 
 # Build wxWindows