Make the RPM builder and .spec a little simpler

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

wxPython/distrib/makerpm

@@ -16,12 +16,11 @@ fi
 distdir=`pwd`/dist
 builddir=`pwd`/_build_rpm
 rpmtop=${builddir}/rpmtop
-cvsroot=:pserver:anoncvs@cvs.wxwindows.org:/home/wxcvs
+cvsroot=:pserver:anoncvs@cvs.wxwindows.org:/pack/cvsroots/wxwindows
 pythonbin=/usr/bin/python
 port=GTK
 lcport=gtk
 tarname=wxPythonSrc
-debug=0
 
 
 #----------------------------------------------------------------------
@@ -40,7 +39,6 @@ function useage {
     echo "   skiprpm        Don't build the RPM (but why?)"
     echo "   skipclean      Don't do the cleanup at the end"
     echo "   speconly       Do nothing but write the RPM spec file"
-    echo "   debug          Make a __WXDEBUG__ version"
     echo "   smp            Add SMP=2 to the envivonment to speed wxGTK build"
 }
 
@@ -70,7 +68,6 @@ function makespec {
     cat ${spectemplate} \
 	| sed s:@PYTHON@:${python}:g \
 	| sed s:@PYVER@:${pyver}:g \
-	| sed s:@DEBUG@:${debug}:g \
 	| sed s:@PORT@:${port}:g \
 	| sed s:@LCPORT@:${lcport}:g \
 	| sed s:@TARNAME@:${tarname}:g \
@@ -88,7 +85,6 @@ for flag in $*; do
 	skiptar)   skiptar=1        ;;
 	skiprpm)   skiprpm=1        ;;
 	smp)       export SMP=2     ;;
-	debug)     debug=1          ;;
 	speconly)  makespec; exit 0 ;;
 
 	*)  echo "Unknown flag \"${flag}\""
@@ -190,7 +186,7 @@ fi
 if [ -z "${skiprpm}" ]; then
     echo "*** Building RPMs..."
     cp ${distdir}/${tarver}.tar.gz ${rpmtop}/SOURCES
-    rpm -ba \
+    rpmbuild -ba \
 	--define "_topdir ${rpmtop}" \
 	--define "_tmppath ${builddir}" \
 	${distdir}/wxPython${port}.spec