Ticket #2562: rpm41.patch

./files/patch-configure.ac.1.diff

@@ +1 @@
+--- ./configure.ac.jbj  Tue Jan 11 14:03:26 2005
++++ ./configure.ac      Tue Jan 11 14:04:19 2005
+@@ -859,6 +859,18 @@
+ WITH_PYTHON_VERSION=$withval
+ if test $withval = auto ; then
+ 
++  AC_MSG_CHECKING(for python 2.4)
++  AC_TRY_RUN([
++#include <python2.4/Python.h>
++main() {
++  exit(strncmp("2.4", PY_VERSION, 3));
++} ],
++  withval=yes, withval=no, withval=yes)
++  AC_MSG_RESULT($withval)
++  if test $withval = yes ; then
++    WITH_PYTHON_VERSION="2.4"
++  else
++
+   AC_MSG_CHECKING(for python 2.3)
+   AC_TRY_RUN([
+ #include <python2.3/Python.h>
+@@ -894,6 +906,7 @@
+     if test $withval = yes ; then
+       WITH_PYTHON_VERSION="1.5"
+     fi
++  fi
+   fi
+   fi
+ fi

./files/patch-rpmdebug-py.c.diff

@@ +1 @@
+--- ./python/rpmdebug-py.c.jbj  Tue Jan 11 14:24:09 2005
++++ ./python/rpmdebug-py.c      Tue Jan 11 14:25:00 2005
+@@ -37,7 +37,9 @@
+     if (o->ob_type == &PyCode_Type)    return "Code";
+     if (o->ob_type == &PyComplex_Type) return "Complex";
+     if (o->ob_type == &PyDict_Type)    return "Dict";
++#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 4
+     if (o->ob_type == &PyDictIter_Type)        return "DictIter";
++#endif
+     if (o->ob_type == &PyFile_Type)    return "File";
+     if (o->ob_type == &PyFloat_Type)   return "Float";
+     if (o->ob_type == &PyFrame_Type)   return "Frame";

./files/patch-rpmrc-py.c.diff

@@ +1 @@
+--- ./python/rpmrc-py.c.jbj     Tue Jan 11 13:55:24 2005
++++ ./python/rpmrc-py.c Tue Jan 11 13:59:59 2005
+@@ -213,6 +213,7 @@
+     return PyDict_Type.tp_richcompare(v, w, op);
+ }
+ 
++#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 4
+ /**
+  */
+ static PyObject * rpmrc_iter(PyObject * s)
+@@ -248,6 +249,10 @@
+        return PyDictIter_Type.tp_methods[0].ml_meth(s, args);
+     return NULL;
+ }
++#else
++#define rpmrc_iter      0
++#define rpmrc_iternext  0
++#endif
+ 
+ /** \ingroup python
+  */
+@@ -314,7 +319,7 @@
+        NULL },
+     { "delMacro",      (PyCFunction) rpmrc_DelMacro, METH_VARARGS,
+        NULL },
+-#if Py_TPFLAGS_HAVE_ITER       /* XXX backport to python-1.5.2 */
++#if Py_TPFLAGS_HAVE_ITER && PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 4
+     { "next",          (PyCFunction) rpmrc_next,     METH_VARARGS,
+        "next() -- get the next value, or raise StopIteration"},
+ #endif

./Portfile

@@ -53 +53 @@
                 patch-Makefile-in.diff          patch-ltmain-sh.diff \
                 patch-rpmrc-in.diff             \
                 patch-autodeps-darwin-prov.diff patch-autodeps-darwin-req.diff \
-                patch-python-makefile-in.diff   patch-configure.ac.diff
+                patch-python-makefile-in.diff   patch-configure.ac.diff \
+                patch-configure.ac.1.diff       patch-rpmrc-py.c.diff \
+                patch-rpmdebug-py.c.diff
 
 
         post-patch {