Changeset 12470 for packaging/centuryegg/build-matplotlib-rpm

Timestamp:

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

Author:

build

Message:

Move all Python versioning to two evironment variables

Files:

• packaging/centuryegg/build-matplotlib-rpm (modified) (5 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*