rpms/deltarpm/devel deltarpm-python-error.patch, 1.3, 1.4 deltarpm.spec, 1.29, 1.30

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29445

Modified Files:
	deltarpm-python-error.patch deltarpm.spec 
Log Message:
Don't use new functions that aren't on old kernels.


deltarpm-python-error.patch:
 deltarpmmodule.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Index: deltarpm-python-error.patch
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm-python-error.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- deltarpm-python-error.patch	9 Sep 2009 19:51:22 -0000	1.3
+++ deltarpm-python-error.patch	10 Sep 2009 19:10:40 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up deltarpm-git-20090831.1/deltarpmmodule.c.foo deltarpm-git-20090831.1/deltarpmmodule.c
 --- deltarpm-git-20090831.1/deltarpmmodule.c.foo	2009-08-31 10:17:34.000000000 -0400
-+++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-09 15:44:49.000000000 -0400
++++ deltarpm-git-20090831.1/deltarpmmodule.c	2009-09-10 15:04:01.000000000 -0400
 @@ -66,13 +66,17 @@ static PyObject *doRead(PyObject *s, PyO
    int pid;
    int ipcpipe[2];
@@ -14,14 +14,14 @@ diff -up deltarpm-git-20090831.1/deltarp
    /* The delta rpm code does not expect to be used in its way. Its error handling
     * conststs of 'printf' and 'exit'. So, dirty hacks abound. */
 -  if (pipe2(ipcpipe, O_NONBLOCK) == -1)
-+  if (pipe2(ipcpipe, O_NONBLOCK) == -1) {
++  if (pipe(ipcpipe) == -1) {
 +    PyErr_SetFromErrno(PyExc_SystemError);
      return NULL;
 +  }
  
    if ((pid = fork())) {
      FILE *readend = fdopen(ipcpipe[0], "r");
-@@ -90,8 +94,10 @@ static PyObject *doRead(PyObject *s, PyO
+@@ -90,8 +96,10 @@ static PyObject *doRead(PyObject *s, PyO
  
      readdeltarpm(filename, &d, NULL);
      PyMarshal_WriteObjectToFile(createDict(d), writend, Py_MARSHAL_VERSION);


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- deltarpm.spec	9 Sep 2009 19:51:22 -0000	1.29
+++ deltarpm.spec	10 Sep 2009 19:10:40 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090831.1.3%{?dist}
+Release: 0.git.20090831.1.4%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -51,7 +51,7 @@ This package contains python bindings fo
 
 %prep
 %setup -q -n %{name}-git-20090831.1
-%patch -p1
+%patch -p1 -b .foo
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -98,6 +98,9 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Thu Sep 10 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.4
+- fix python bindings to not require kernel >= 2.6.27
+
 * Wed Sep  9 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.3
 - fix python bindings to:
   - call _exit(), not exit()