rpms/python-vorbis/devel python-vorbis-1.5a-python2.5.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 python-vorbis.spec, 1.6, 1.7 sources, 1.3, 1.4

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/python-vorbis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573/devel

Modified Files:
	.cvsignore python-vorbis.spec sources 
Added Files:
	python-vorbis-1.5a-python2.5.patch 
Log Message:
Update to 1.5a and fix python 2.5 crash (#285341).


python-vorbis-1.5a-python2.5.patch:

--- NEW FILE python-vorbis-1.5a-python2.5.patch ---
diff -Nur pyvorbis-1.5a/src/pyvorbiscodec.c pyvorbis-1.5apatched/src/pyvorbiscodec.c
--- pyvorbis-1.5a/src/pyvorbiscodec.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbiscodec.c	2007-09-11 00:17:48.000000000 +0200
@@ -118,7 +118,7 @@
 {
   vorbis_dsp_clear(PY_DSP(self));
   Py_XDECREF(((py_dsp *)self)->parent);
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject*
diff -Nur pyvorbis-1.5a/src/pyvorbisfile.c pyvorbis-1.5apatched/src/pyvorbisfile.c
--- pyvorbis-1.5a/src/pyvorbisfile.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisfile.c	2007-09-11 00:21:22.000000000 +0200
@@ -171,7 +171,7 @@
 
   ret = py_ov_open(newobj, args);
   if (ret == NULL) {
-    PyMem_DEL(newobj);
+    PyObject_Del(newobj);
     return NULL;
   }
 
@@ -196,7 +196,7 @@
 
   free(py_self->ovf);
 
-  PyObject_DEL(self);
+  PyObject_Del(self);
 }
 
 static PyObject *
diff -Nur pyvorbis-1.5a/src/pyvorbisinfo.c pyvorbis-1.5apatched/src/pyvorbisinfo.c
--- pyvorbis-1.5a/src/pyvorbisinfo.c	2006-10-24 21:09:28.000000000 +0200
+++ pyvorbis-1.5apatched/src/pyvorbisinfo.c	2007-09-11 00:16:42.000000000 +0200
@@ -134,7 +134,7 @@
 static void
 py_ov_info_dealloc(PyObject *self)
 {
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 #define CMP_RET(x) \
@@ -418,7 +418,7 @@
     free(ovc_self->vc);
   }
 
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 
@@ -999,6 +999,7 @@
 #if PY_UNICODE
       item = PyUnicode_DecodeUTF8(val, vallen, NULL);
       if (!item) {
+        PyErr_Clear();
         /* To deal with non-UTF8 comments (against the standard) */
         item = PyString_FromStringAndSize(val, vallen); 
       } 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2007 18:30:31 -0000	1.3
+++ .cvsignore	12 Sep 2007 10:57:49 -0000	1.4
@@ -1 +1 @@
-pyvorbis-1.4.tar.gz
+pyvorbis-1.5a.tar.gz


Index: python-vorbis.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/devel/python-vorbis.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-vorbis.spec	23 Aug 2007 07:47:44 -0000	1.6
+++ python-vorbis.spec	12 Sep 2007 10:57:49 -0000	1.7
@@ -2,12 +2,13 @@
 
 Summary: Python wrapper for the Ogg Vorbis audio libraries
 Name: python-vorbis
-Version: 1.4
-Release: 3
+Version: 1.5
+Release: 0.2.a
 License: LGPLv2
 Group: Development/Languages
 URL: http://ekyo.nerim.net/software/pyogg/
-Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}.tar.gz
+Source: http://ekyo.nerim.net/software/pyogg/pyvorbis-%{version}a.tar.gz
+Patch0: python-vorbis-1.5a-python2.5.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-ogg
 BuildRequires: python-devel, python-ogg-devel, libvorbis-devel
@@ -19,7 +20,8 @@
 
 
 %prep
-%setup -q -n pyvorbis-%{version}
+%setup -q -n pyvorbis-%{version}a
+%patch0 -p1 -b .python2.5
 
 
 %build
@@ -43,6 +45,10 @@
 
 
 %changelog
+* Wed Sep 12 2007 Matthias Saou <http://freshrpms.net/> 1.5-0.2.a
+- Update to 1.5a pre-release.
+- Include patch to fix crash with python 2.5 (#285341).
+
 * Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.4-3
 - Rebuild for new BuildID feature.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vorbis/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2007 18:30:31 -0000	1.3
+++ sources	12 Sep 2007 10:57:49 -0000	1.4
@@ -1 +1 @@
-b4921e792c0a74f75b9d3057df10ee7c  pyvorbis-1.4.tar.gz
+7c7bce3ca3fc4f075ce9220c8c0c2200  pyvorbis-1.5a.tar.gz