Adapt to new file naming scheme, new Installer structures, and other

build tweaks.


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

wxPython/distrib/all/build-linux

@@ -32,51 +32,53 @@ PYVER=$@
 rpmtop=_rpm_top
 
 function DoRPMBuild {
-    echo "*** Setting up RPM build dirs"
-    for dir in SPECS BUILD RPMS SRPMS tmp; do
-	if [ ! -d $rpmtop/$dir ]; then
-	    mkdir -p $rpmtop/$dir
-	fi
-    done
-    if [ ! -e $rpmtop/SOURCES ]; then
-	ln -s $PWD $rpmtop/SOURCES
-    fi
-
+    # $1 : python version
+    # $2 : port
+    # $3 : unicode
+    
     rpmbuild --define "_topdir $PWD/$rpmtop" \
 	--define "_tmppath $PWD/$rpmtop/tmp" \
-	--define "release $RELEASE" \
-	$@
+	--define "release ${RELEASE}_py$1" \
+	--define "pyver $1" \
+	--define "port $2" \
+	--define "unicode $3" \
+	-bb wxPython.spec
 
     if [ $? != 0 ]; then
 	return $?
     fi
-
-    echo "*** Moving RPMs to ."
-    find $rpmtop -name "*.rpm"
-    mv -f `find $rpmtop -name "*.rpm"` .
-
-    echo "*** Cleaning up $rpmtop"
-    rm -rf $rpmtop
 }
 
 
 
+echo "*** Setting up RPM build dirs"
+for dir in SPECS BUILD RPMS SOURCES SRPMS tmp; do
+    if [ ! -d $rpmtop/$dir ]; then
+	mkdir -p $rpmtop/$dir
+    fi
+done
+
+cp wxPython-src-$VERSION.tar.gz $rpmtop/SOURCES
+
+echo "******************** PYVER = " $PYVER
 for ver in $PYVER; do 
     echo "Building the RPMs for Python $ver..."
-    for port in GTK GTK2; do
-	rpm2cpio wxPython$port-py$ver-$VERSION-1.src.rpm | \
-	    cpio --extract -R root.
-	DoRPMBuild -ba wxPython$port.spec
-    done
+    DoRPMBuild $ver gtk  0
+    DoRPMBuild $ver gtk2 1
+    DoRPMBuild $ver gtk2 0
 done
 
 
+echo "*** Moving RPMs to ."
+find $rpmtop -name "*.rpm"
+mv -f `find $rpmtop -name "*.rpm"` .
+
+
 if [ $SKIPCLEAN != yes ]; then 
+    echo "*** Cleaning up $rpmtop"
+    rm -rf $rpmtop
+
     echo "Cleaning up..."
-    for ver in $PYVER; do 
-	rm wxPythonGTK-py$ver-$VERSION-*.src.rpm
-	rm wxPythonGTK2-py$ver-$VERSION-*.src.rpm
-    done
     rm *.spec *.tar.gz
 fi