rpms/fuse-python/F-9 fuse-python--libewf_fix.diff, NONE, 1.1 fuse-python.spec, 1.3, 1.4

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/fuse-python/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2138/F-9

Modified Files:
	fuse-python.spec 
Added Files:
	fuse-python--libewf_fix.diff 
Log Message:
fixed issue with libewf (reported by BCL)

fuse-python--libewf_fix.diff:

--- NEW FILE fuse-python--libewf_fix.diff ---
Only in fuse-python-0.2: Changelog
Only in python: CVS
Only in python/example: CVS
Only in python/fuseparts: CVS
diff -ru fuse-python-0.2/fuseparts/_fusemodule.c python/fuseparts/_fusemodule.c
--- fuse-python-0.2/fuseparts/_fusemodule.c	2007-06-18 18:20:09.000000000 +0400
+++ python/fuseparts/_fusemodule.c	2008-04-24 18:52:10.000000000 +0400
@@ -118,7 +118,7 @@
 
 /* transform a Python integer to an unsigned C numeric value */
 
-#define py2attr(st, attr)						\
+#define py2attr(st, attr) {						\
 	if (PyInt_Check(pytmp) && sizeof((st)->attr) <= sizeof(long)) {	\
 		/*							\
 		 * We'd rather use here PyInt_AsUnsignedLong() here	\
@@ -162,8 +162,9 @@
 		goto OUT_DECREF;					\
 	(st)->attr = ctmp;						\
 	if ((unsigned long long)(st)->attr != ctmp)			\
-		goto OUT_DECREF;
-		
+		goto OUT_DECREF;					\
+}
+
 #define fetchattr_nam(st, attr, aname)					\
 	if (!(pytmp = PyObject_GetAttrString(v, aname)))		\
 		goto OUT_DECREF;					\
@@ -174,7 +175,13 @@
 
 #define fetchattr_soft(st, attr)					\
 	if (PyObject_HasAttrString(v, #attr)) {				\
-		fetchattr(st, attr);					\
+		pytmp = PyObject_GetAttrString(v, #attr);		\
+		if (!pytmp)						\
+			goto OUT_DECREF;				\
+	        if (pytmp == Py_None)					\
+			Py_DECREF(pytmp);				\
+		else							\
+			py2attr(st, attr);				\
 	}
 
 /*
@@ -891,6 +898,7 @@
 	save = PyEval_SaveThread();
 	err = fuse_loop_mt(f);
 	PyEval_RestoreThread(save);
+	interp = NULL;
 #endif
 
 	return(err);
diff -ru fuse-python-0.2/fuse.py python/fuse.py
--- fuse-python-0.2/fuse.py	2007-06-25 03:08:09.000000000 +0400
+++ python/fuse.py	2008-01-23 22:32:47.000000000 +0300
@@ -461,7 +461,7 @@
     FUSE, see ``fuse.h``).
     """
 
-    def __init__(self, name, **kw):
+    def __init__(self, **kw):
     
         self.l_type  = None
         self.l_start = None
@@ -477,7 +477,7 @@
     http://www.opengroup.org/onlinepubs/009695399/basedefs/time.h.html
     """
 
-    def __init__(self, name, **kw):
+    def __init__(self, **kw):
     
         self.tv_sec  = None
         self.tv_nsec = None
Only in fuse-python-0.2: fuse_python.egg-info
Only in fuse-python-0.2: MANIFEST.in
Only in fuse-python-0.2: PKG-INFO
Only in fuse-python-0.2: README.new_fusepy_api.html
Only in fuse-python-0.2: setup.cfg
Only in python/util: CVS


Index: fuse-python.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-python/F-9/fuse-python.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fuse-python.spec	19 Feb 2008 18:38:40 -0000	1.3
+++ fuse-python.spec	27 Apr 2008 16:57:29 -0000	1.4
@@ -2,17 +2,18 @@
 
 Name:           fuse-python
 Version:        0.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Python bindings for FUSE - filesystem in userspace
 
 Group:          System Environment/Base
 License:        LGPLv2
 URL:            http://fuse.sourceforge.net/wiki/index.php/FusePython
 Source0:        http://downloads.sourceforge.net/fuse/%{name}-%{version}.tar.gz
+Patch0:		fuse-python--libewf_fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:       python-fuse = %{version}-%{release}
 
-BuildRequires:  pkgconfig 
+BuildRequires:  pkgconfig
 BuildRequires:  fuse-devel
 # Must have setuptools to build the package
 # The build portions moved to a subpackage in F-8
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .libewf
 
 %build
 python setup.py build
@@ -48,6 +50,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Sun Apr 27 2008 Peter Lemenkov <lemenkov at gmail.com> 0.2-8
+- Fix issue with libewf
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2-7
 - Autorebuild for GCC 4.3