Changeset 12470

Timestamp:

11/08/10 06:37:18 (19 months ago)

Author:

build

Message:

Move all Python versioning to two evironment variables

Location:

packaging/centuryegg

Files:

• build-matplotlib-rpm (modified) (5 diffs)
• build-python-rpm (modified) (4 diffs)
• build-rpms (modified) (1 diff)
• build-sjsoft-rpm (modified) (4 diffs)
• find-srpms (modified) (6 diffs)
• install-python-rpm (modified) (2 diffs)
• makeall (modified) (3 diffs)

packaging/centuryegg/build-matplotlib-rpm

@@ -5 +5 @@
     exit
 fi
-if [ "x`rpm -qa numpy25`" == "x" ]
+if [ "x`rpm -qa numpy$PYTHON_SUFFIX`" == "x" ]
 then
-    sudo rpm -Uvh rpms/numpy25*
+    sudo rpm -Uvh rpms/numpy$PYTHON_SUFFIX*
 fi
 if [ "x`rpm -qa libglade2-devel`" == "x" ]
@@ -15 +15 @@
 ./find-srpms python-numeric || exit 1
 ./find-srpms python-numarray || exit 1
-if [ "x`rpm -qa python25-numeric`" == "x" ]
+if [ "x`rpm -qa python$PYTHON_SUFFIX-numeric`" == "x" ]
 then
-    sudo rpm -Uvh rpms/python25-numeric*.rpm
+    sudo rpm -Uvh rpms/python$PYTHON_SUFFIX-numeric*.rpm
 fi
-if [ "x`rpm -qa python25-numarray`" == "x" ]
+if [ "x`rpm -qa python$PYTHON_SUFFIX-numarray`" == "x" ]
 then
-    sudo rpm -Uvh rpms/python25-numarray*.rpm
+    sudo rpm -Uvh rpms/python$PYTHON_SUFFIX-numarray*.rpm
 fi
 ./find-srpms "cairo>=1.4" || exit 1
@@ -29 +29 @@
 fi
 ./find-srpms "pycairo>=1.4" || exit 1
-if [ "x`rpm -qa pycairo-py25-devel`" == "x" ]
+if [ "x`rpm -qa pycairo$PYTHON_SUFFIX2-devel`" == "x" ]
 then
-    sudo rpm -Uvh rpms/pycairo-py25-*.rpm
+    sudo rpm -Uvh rpms/pycairo$PYTHON_SUFFIX2-*.rpm
 fi
 GLIB2_VERSION=`yum info glib2-devel | grep Version | head -n 1 | sed -e "s/[ \t]\+/ /g" | cut -d ":" -f 2 | cut -d " " -f 2`
@@ -37 +37 @@
 then
     ./find-srpms pygobject2 || exit 1
-    if [ "x`rpm -qa pygobject2-py25-devel`" == "x" ]
+    if [ "x`rpm -qa pygobject2$PYTHON_SUFFIX2-devel`" == "x" ]
     then
-        sudo rpm -Uvh rpms/pygobject2-py25*.rpm
+        sudo rpm -Uvh rpms/pygobject2$PYTHON_SUFFIX2*.rpm
     fi
 fi
@@ -47 +47 @@
     rpm -e pygtk2-devel || exit 1
 fi
-if [ "x`rpm -qa pygtk2-py25-devel`" == "x" ]
+if [ "x`rpm -qa pygtk2$PYTHON_SUFFIX2-devel`" == "x" ]
 then
-    sudo rpm -Uvh rpms/pygtk2-py25*.rpm
+    sudo rpm -Uvh rpms/pygtk2$PYTHON_SUFFIX2*.rpm
 fi
 ./find-srpms "python-matplotlib>=0.91.2" || exit 1
-rm -f rpms/python25-matplotlib-tk*
+rm -f rpms/python$PYTHON_SUFFIX-matplotlib-tk*
 

packaging/centuryegg/build-python-rpm

@@ -1 +1 @@
 #!/bin/bash
+PYTHON_SRPM_URL=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/10/Everything/source/SRPMS/python-2.5.2-1.fc10.src.rpm
 mkdir -p logs rpms srpms
-if [ $(ls rpms/python25-2.5*.rpm | wc -l) -gt 0 ]
+if [ $(ls rpms/python$PYTHON_SUFFIX-$PYTHON_VERSION*.rpm | wc -l) -gt 0 ]
 then
     echo "Not building python as the following packages are already built:"
-    ls rpms/python25-2.5*.rpm
+    ls rpms/python$PYTHON_SUFFIX-$PYTHON_VERSION*.rpm
     exit
 fi
@@ -64 +65 @@
 (
 cd srpms
-wget -c http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/10/Everything/source/SRPMS/python-2.5.2-1.fc10.src.rpm
-rpm -ivh python-2.5*.src.rpm
+wget -c $PYTHON_SRPM_URL
+rpm -ivh python-$PYTHON_VERSION*.src.rpm
 )
 DB_VERSION=`yum info db4-devel | grep Version | head -n 1 | sed -e "s/[ \t]\+/ /g" | cut -d ":" -f 2 | cut -d " " -f 2 | sed -e "s/\([0-9]\+\.[0-9]\+\)\..*/\1/"`
-sed -ie "s/DBLIBVER=4.[4-9]/DBLIBVER=$DB_VERSION/" ~/rpmbuild/SOURCES/python-2.5-config.patch
+[ -f ~/rpmbuild/SOURCES/python-$PYTHON_VERSION-config.patch ] && sed -ie "s/DBLIBVER=4.[4-9]/DBLIBVER=$DB_VERSION/" ~/rpmbuild/SOURCES/python-$PYTHON_VERSION-config.patch
 sed -ie "s/db4-devel >= 4.[4-9]/db4-devel >= $DB_VERSION/" $HOME/rpmbuild/SPECS/python.spec
 # Name of libX11-devel on old systems is xorg-x11-devel
@@ -75 +76 @@
     if [[ $REDHAT_VERSION -lt 5 ]]
     then
-        sed -ie 's/\+.*-lX11/\+ -L\/usr\/X11R6\/lib -lX11/' $HOME/rpmbuild/SOURCES/python-2.5-config.patch
+        [ -f ~/rpmbuild/SOURCES/python-$PYTHON_VERSION-config.patch ] && sed -ie 's/\+.*-lX11/\+ -L\/usr\/X11R6\/lib -lX11/' ~/rpmbuild/SOURCES/python-$PYTHON_VERSION-config.patch
         sed -ie 's/libX11-devel/xorg-x11-devel/' $HOME/rpmbuild/SPECS/python.spec
     fi
@@ -91 +92 @@
 # QA_RPATHS to prevent /usr/lib64... sqlite error
 # --define __python_ver to include the python version in the bin filenames etc
-QA_RPATHS=0x0001 rpmbuild  --define '__python_ver 25' -ba ~/rpmbuild/SPECS/python.spec >logs/build-python25.log 2>&1
+QA_RPATHS=0x0001 rpmbuild  --define '__python_ver $PYTHON_SUFFIX' -ba ~/rpmbuild/SPECS/python.spec >logs/build-python$PYTHON_SUFFIX.log 2>&1
 result=$?
-tail logs/build-python25.log
-cp -pv ~/rpmbuild/RPMS/$rpm_arch/python25{,-debuginfo,-devel,-libs,-test,-tools}-2.5*.rpm rpms/
-cp -pv ~/rpmbuild/RPMS/$rpm_arch/tkinter25-2.5*.rpm rpms/
-cp -pv ~/rpmbuild/SRPMS/python25-2.5*.rpm rpms/
+tail logs/build-python$PYTHON_SUFFIX.log
+cp -pv ~/rpmbuild/RPMS/$rpm_arch/python$PYTHON_SUFFIX{,-debuginfo,-devel,-libs,-test,-tools}-$PYTHON_VERSION*.rpm rpms/
+cp -pv ~/rpmbuild/RPMS/$rpm_arch/tkinter$PYTHON_SUFFIX-$PYTHON_VERSION*.rpm rpms/
+cp -pv ~/rpmbuild/SRPMS/python$PYTHON_SUFFIX-$PYTHON_VERSION*.rpm rpms/
 

packaging/centuryegg/build-rpms

@@ -30 +30 @@
 
 os.chdir(tmp_dir)
-if sys.version_info[0] == 2 and sys.version_info[1] < 5:
-    easyinstall = "easy_install-2.5"
-    python = "python2.5"
+if sys.version_info[0] == 2 and sys.version_info[1] < os.environ["MIN_PYTHON_MINOR_VERSION"]:
+    easyinstall = "easy_install-"+os.environ["PYTHON_VERSION"]
+    python = "python"+os.environ["PYTHON_VERSION"]
 else:
     easyinstall = "easy_install"

packaging/centuryegg/build-sjsoft-rpm

@@ -27 +27 @@
 
 building_new_python = sys.version_info[0] == 2 and sys.version_info[1] < 5
+python_suffix = os.environ.get("PYTHON_SUFFIX","")
+python_suffix2 = os.environ.get("PYTHON_SUFFIX2","")
 
 SJSOFT_URL="svn+ssh://svn.sjsoft.com/home/closedsvn/svn"
@@ -38 +40 @@
     log_filename = os.path.join(log_dir, "sjsoft-svn-%s.log" % BRANCH_PATH)
     log_file = open(log_filename, "wb")
-    
     subprocess.call(["svn", "co", SVN_URL, "sjsoft-src-%s" % BRANCH_PATH], stdout=log_file)
     os.chdir("sjsoft-src-%s" % BRANCH_PATH)
     subprocess.call(["svn", "up"], stdout=log_file)
     subprocess.call(["svn", "switch", SVN_URL], stdout=log_file)
+    shutil.rmtree(os.path.join("sjsoft", "Library", "FunctionalTests"))
     if not os.path.exists("yahp.jar"):
         subprocess.call(["wget","-c","http://download.sjsoft.com/yahpconverter/yahp1.2.19c.jar","-O","yahp.jar"], stdout=log_file)
@@ -67 +69 @@
                     ("pyparsing", "1.4.7"),
                     ("xlwt", "0.7.1"),
-                    ("soaplib", "0.9")]
-    if building_new_python:
-        requirements.extend([("MySQL-python25", "1.2.1"),
-                             ("numpy25", "1.0.3"),
-                             ("protobuf-python25", "2.0.2"),
-                             ("python25-imaging", "1.1.5"),
-                             ("python25-ldap", "2.3"),
-                             ("python25-nose", "0.9.2"),
-                             ("python25-pgsql", "0.9.6"),
-                             ("python25-simplejson", "1.7.3"),
-                             ("python25-xlrd", "0.6.1"),
-                             ("python25-crypto", "2.0.1"),
-                             ("python25-lxml","1.3.6"),
-                             ("python25-dateutil","1.1"),
-                             ("pytz-py25","2006a"),
-                             ("PyXML-py25","0.8.4"),
-                             ("python25-suds","0.3.3")
-                           ])
-    else:
-        requirements.extend([("MySQL-python", "1.2.1"),
-                             ("numpy", "1.0.3"),
-                             ("protobuf-python", "2.0.2"),
-                             ("python-imaging", "1.1.5"),
-                             ("python-ldap", "2.3"),
-                             ("python-nose", "0.9.2"),
-                             ("python-pgsql", "0.9.6"),
-                             ("python-simplejson", "1.7.3"),
-                             ("python-xlrd", "0.6.1")
-                             ("python-crypto", "2.0.1")
-                             ("python-lxml","1.3.6"),
-                             ("python-dateutil","1.1"),
-                             ("pytz","2006a"),
-                             ("PyXML","0.8.4"),
-                             ("python-suds","0.3.3")
-                           ])
+                    ("pytz"+python_suffix2,"2006a"),
+                    ("PyXML"+python_suffix2,"0.8.4"),
+                    ("soaplib", "0.9"),
+                    ("MySQL-python"+python_suffix, "1.2.1"),
+                    ("numpy"+python_suffix, "1.0.3"),
+                    ("protobuf-python"+python_suffix, "2.0.2"),
+                    ("python%s-imaging" % python_suffix, "1.1.5"),
+                    ("python%s-ldap" % python_suffix, "2.3"),
+                    ("python%s-nose" % python_suffix, "0.9.2"),
+                    ("python%s-pgsql" % python_suffix, "0.9.6"),
+                    ("python%s-simplejson" % python_suffix, "1.7.3"),
+                    ("python%s-xlrd" % python_suffix, "0.6.1"),
+                    ("python%s-crypto" % python_suffix, "2.0.1"),
+                    ("python%s-lxml" % python_suffix,"1.3.6"),
+                    ("python%s-dateutil" % python_suffix,"1.1"),
+                    ("python%s-suds" % python_suffix,"0.3.3")
+                   ]
     if int(BRANCH_PATH.split('.')[0]) > 1 or int(BRANCH_PATH.split('.')[1]) >= 10:
         requirements.append(("Babel", "0.9.1"))
@@ -110 +94 @@
     log_file = open(log_filename, "wb")
     if building_new_python:
-        ret_code = subprocess.call(["python2.5", "setup_standalone.py", "bdist_rpm", "--fix-python"], stdout=log_file, stderr=log_file)
+        ret_code = subprocess.call(["python"+os.environ["PYTHON_VERSION"], "setup_standalone.py", "bdist_rpm", "--fix-python"], stdout=log_file, stderr=log_file)
     else:
         ret_code = subprocess.call(["python", "setup_standalone.py", "bdist_rpm", "--fix-python"], stdout=log_file, stderr=log_file)

packaging/centuryegg/find-srpms

@@ -91 +91 @@
     try_install = False
     replace_python = True
-    python25_exe = subprocess.Popen(["which", "python25"], stdout=subprocess.PIPE).communicate()[0].replace("\n","")
+    python_exe = subprocess.Popen(["which", "python"+os.environ["PYTHON_SUFFIX"]], stdout=subprocess.PIPE).communicate()[0].replace("\n","")
     if quote_defines:
-        rpmdefines = ["--define",'"__python %s"' % (python25_exe)]
+        rpmdefines = ["--define",'"__python %s"' % (python_exe)]
     else:
-        rpmdefines = ["--define",'__python %s' % (python25_exe)]
-    python_version = "2.5"
+        rpmdefines = ["--define",'__python %s' % (python_exe)]
+    python_version = os.environ["PYTHON_VERSION"]
 else:
     no_name_change = True
     try_install = True
     replace_python = False
-    python25_exe = subprocess.Popen(["which", "python"], stdout=subprocess.PIPE).communicate()[0].replace("\n","")
+    python_exe = subprocess.Popen(["which", "python"], stdout=subprocess.PIPE).communicate()[0].replace("\n","")
     rpmdefines = []
     python_version = "%d.%d" % (sys.version_info[0], sys.version_info[1])
@@ -111 +111 @@
 old_python_setuptools = version < 8
 old_x11 = version < 5
+python_suffix = os.environ.get("PYTHON_SUFFIX","")
+python_suffix2 = os.environ.get("PYTHON_SUFFIX2","")
 
 REQUIREMENT_PARSER = re.compile("([^<=>]*)([<=>]+.*)?")
 
 def fix_package_name(package_name, force_version_marker=False):
-    """Fixes the package name to refer to python 25 - if the force_version_marker argument is True, -py25 will be appended if no other method is found"""
+    """Fixes the package name to refer to python $PYTHON_SUFFIX - if the force_version_marker argument is True, $PYTHON_SUFFIX2 will be appended if no other method is found"""
     # Replace the word python, but not python followed by a variable, as we don't know the purpose of the variable
     if package_name == "Distutils":
@@ -122 +124 @@
         return package_name
     elif package_name == "tkinter":
-        return "tkinter25"
+        return "tkinter"+python_suffix
     elif re.match(r".*\bpython\b[^%]", package_name) or package_name.endswith("python"):
-        return re.sub(r"\bpython\b","python25",package_name)
+        return re.sub(r"\bpython\b","python"+python_suffix,package_name)
     elif re.match(r".*\bpython2\b[^%]", package_name) or package_name.endswith("python2"):
-        return re.sub(r"\bpython2\b","python25",package_name)
+        return re.sub(r"\bpython2\b","python"+python_suffix,package_name)
     elif package_name.endswith("py"):
-        return package_name + "25"
+        return package_name + python_suffix
     elif package_name in ["protobuf", "cairo"]:
         # we'll manually change the protobuf-python package, but not the rest
@@ -136 +138 @@
     elif package_name.startswith("py"):
         if package_name.endswith("-devel"):
-            return package_name.replace("-devel","-py25-devel")
+            return package_name.replace("-devel",python_suffix2+"-devel")
         if package_name.endswith("-doc"):
-            return package_name.replace("-doc","-py25-doc")
+            return package_name.replace("-doc",python_suffix2+"-doc")
         if package_name.endswith("-codegen"):
-            return package_name.replace("-codegen","-py25-codegen")
-        return package_name + "-py25"
+            return package_name.replace("-codegen",python_suffix2+"-codegen")
+        return package_name + python_suffix2
     elif force_version_marker:
-        return package_name + "-py25"
+        return package_name + python_suffix2
     return package_name
 
@@ -232 +234 @@
             line = '%if "eggs" == "eggs"\n'
         if replace_python and re.compile("^%(package|description|files).*").match(line) and "python" in line:
-            line = re.sub(r"\bpython\b", "python25", line)
+            line = re.sub(r"\bpython\b", "python"+python_suffix, line)
         if re.compile("^(Name|Provides|Requires|BuildRequires|BuildPre).*").match(line):
             if line.startswith("Name:"):
@@ -267 +269 @@
             line += "export PYTHON=%{__python}\n"
         if line.startswith("%configure") and package_name == "pygtk2":
-            line = line.replace("%configure","%configure --prefix=/opt/pygtk2-py25")
+            line = line.replace("%configure","%configure --prefix=/opt/pygtk2"+python_suffix)
         if line.startswith("%build") and package_name == "python-ldap":
             specfile.write('sed -ie "/OPT_X_TLS_CRL\(CHECK\|_NONE\|_PEER\|_ALL\)/d" Modules/constants.c\n')

packaging/centuryegg/install-python-rpm

@@ -1 +1 @@
 #!/bin/bash
-# sudo yum -y localinstall ~/rpmbuild/RPMS/*/python25{,-libs,-devel}-2.5*.rpm
-if [ "x`rpm -qa python25-devel | grep 2.5`" == "x" ]
+# sudo yum -y localinstall ~/rpmbuild/RPMS/*/python$PYTHON_SUFFIX{,-libs,-devel}-$PYTHON_VERSION*.rpm
+if [ "x`rpm -qa python$PYTHON_SUFFIX-devel | grep $PYTHON_VERSION`" == "x" ]
 then
-    sudo rpm -Uvh ~/rpmbuild/RPMS/*/python25{,-libs,-devel}-2.5*.rpm
+    sudo rpm -Uvh ~/rpmbuild/RPMS/*/python$PYTHON_SUFFIX{,-libs,-devel}-$PYTHON_VERSION*.rpm
 fi
-if [ "x`rpm -qa tkinter25 | grep 2.5`" == "x" ]
+if [ "x`rpm -qa tkinter$PYTHON_SUFFIX | grep $PYTHON_VERSION`" == "x" ]
 then
-    sudo rpm -Uvh ~/rpmbuild/RPMS/*/tkinter25-2.5*.rpm
+    sudo rpm -Uvh ~/rpmbuild/RPMS/*/tkinter$PYTHON_SUFFIX-$PYTHON_VERSION*.rpm
 fi
 if [ "x`rpm -qa yum-utils`" == "x" ]
@@ -19 +19 @@
 yumdownloader $YUMDOWNLOADER_OPTS --source --destdir=$HOME/Packaging/centuryegg/srpms python-setuptools
 rm $HOME/rpmbuild/SPECS/python-setuptools.spec
-rm -f rpms/python25-setuptools-*.rpm
+rm -f rpms/python$PYTHON_SUFFIX-setuptools-*.rpm
 # this will build setuptools by side-effect; we simply ignore and rebuild it
 ./find-srpms python-setuptools
 rpm -ivh $HOME/Packaging/centuryegg/srpms/python-setuptools*.src.rpm
 sed -ie 's/^\(Version: *\)[0-9].*/\10.6c9/g' $HOME/rpmbuild/SPECS/python-setuptools.spec
-sed -ie 's/^\(Name: *\)python-\([a-z0-9]*\)/\1python25-\2/g' $HOME/rpmbuild/SPECS/python-setuptools.spec
+sed -ie 's/^\(Name: *\)python-\([a-z0-9]*\)/\1python$PYTHON_SUFFIX-\2/g' $HOME/rpmbuild/SPECS/python-setuptools.spec
 sed -ie 's#cheeseshop.python.org#pypi.python.org#' $HOME/rpmbuild/SPECS/python-setuptools.spec
-sed -ie 's/^\(\(Provides\|Requires\|BuildRequires\|BuildPre[a-zA-Z]*\): *\)python-\([a-z0-9]*\)/\1python25-\3/g' $HOME/rpmbuild/SPECS/python-setuptools.spec
+sed -ie 's/^\(\(Provides\|Requires\|BuildRequires\|BuildPre[a-zA-Z]*\): *\)python-\([a-z0-9]*\)/\1python$PYTHON_SUFFIX-\3/g' $HOME/rpmbuild/SPECS/python-setuptools.spec
 spectool -g -R  $HOME/rpmbuild/SPECS/python-setuptools.spec
-rpmbuild -ba --define="__python `which python25`" $HOME/rpmbuild/SPECS/python-setuptools.spec > logs/build-python-setuptools.log 2>&1 
-if [ "x`rpm -qa python25-setuptools`" == "x" ]
+rpmbuild -ba --define="__python `which python$PYTHON_SUFFIX`" $HOME/rpmbuild/SPECS/python-setuptools.spec > logs/build-python-setuptools.log 2>&1 
+if [ "x`rpm -qa python$PYTHON_SUFFIX-setuptools`" == "x" ]
 then
-    sudo rpm -Uvh ~/rpmbuild/RPMS/*/python25-setuptools*.rpm
+    sudo rpm -Uvh ~/rpmbuild/RPMS/*/python$PYTHON_SUFFIX-setuptools*.rpm
 fi

packaging/centuryegg/makeall

@@ -1 +1 @@
 #!/bin/bash
+export MIN_PYTHON_VERSION="2.5"
+export MIN_PYTHON_MAJOR_VERSION=`echo $MIN_PYTHON_VERSION | cut -d "." -f 1`
+export MIN_PYTHON_MINOR_VERSION=`echo $MIN_PYTHON_VERSION | cut -d "." -f 2`
 if [ -f /etc/redhat-release ] && [ ! -f /etc/fedora-release ] ;
 then
@@ -28 +31 @@
 # Is the official python version high enough for us just to build?
 PYTHON_VERSION=`rpm -q --queryformat="%{v}" python`
-if [ `echo $PYTHON_VERSION | cut -d "." -f 1` == "2" ] && [ `echo $PYTHON_VERSION | cut -d "." -f 2` -lt 5 ]
+if [ `echo $PYTHON_VERSION | cut -d "." -f 1` == $MIN_PYTHON_MAJOR_VERSION ] && [ `echo $PYTHON_VERSION | cut -d "." -f 2` -lt $MIN_PYTHON_MINOR_VERSION ]
 then
     BUILD_NEW_PYTHON=true
     export BUILD_NEW_PYTHON
-    PYTHON_SUFFIX=25
-    PYTHON_SUFFIX2=-py25
+    export PYTHON_SUFFIX=${MIN_PYTHON_MAJOR_VERSION}${MIN_PYTHON_MINOR_VERSION}
+    export PYTHON_SUFFIX2=-py$PYTHON_SUFFIX
+    export PYTHON_VERSION=${MIN_PYTHON_MAJOR_VERSION}.${MIN_PYTHON_MINOR_VERSION}
+else
+    export PYTHON_VERSION=$(echo $PYTHON_VERSION | cut -d "." -f 1).$(echo $PYTHON_VERSION | cut -d "." -f 2)
 fi
 rpm_arch=`rpmbuild -E %{_arch} 2>/dev/null`
@@ -98 +104 @@
     sudo rpm -Uvh `ls rpms/python$PYTHON_SUFFIX-dateutil-*.{${rpm_arch},noarch}.rpm | grep -v debuginfo`
 fi
-if [ "x$BUILD_NEW_PYTHON" == "x" ]
+if [ "x`rpm -qa pytz$PYTHON_SUFFIX2`" == "x" ]
 then
-    if [ "x`rpm -qa pytz`" == "x" ]
-    then
-        sudo rpm -Uvh rpms/pytz*.rpm
-    fi
-    if [ "x`rpm -qa PyXML`" == "x" ]
-    then
-        sudo rpm -Uvh rpms/PyXML*.rpm
-    fi
-else
-    if [ "x`rpm -qa pytz-py25`" == "x" ]
-    then
-        sudo rpm -Uvh rpms/pytz-py25*.rpm
-    fi
-    if [ "x`rpm -qa PyXML-py25`" == "x" ]
-    then
-        sudo rpm -Uvh rpms/PyXML-py25*.rpm
-    fi
+    sudo rpm -Uvh rpms/pytz$PYTHON_SUFFIX2*.rpm
+fi
+if [ "x`rpm -qa PyXML$PYTHON_SUFFIX2`" == "x" ]
+then
+    sudo rpm -Uvh rpms/PyXML$PYTHON_SUFFIX2*.rpm
 fi
 # We can't yet build matplotlib for RedHat > 4 with a custom Python