- revert default transport back to x11, dbus transport crashes too randomly

Changed files:
    default-transport.patch -> 1.1
    python-skype.spec -> 1.12

diff --git a/default-transport.patch b/default-transport.patch
new file mode 100644 (file)
index 0000000..d098d98
--- /dev/null
+++ b/default-transport.patch
@@ -0,0 +1,34 @@
+restore default transport being X11, dbus crashes so randomly
+
+http://stackoverflow.com/questions/7827108/unexplained-segfault-in-python
+
+http://skype4py.svn.sourceforge.net/viewvc/skype4py?view=revision&revision=277
+http://skype4py.svn.sourceforge.net/viewvc/skype4py/Skype4Py/api/posix.py?r1=277&r2=276&pathrev=277
+http://skype4py.svn.sourceforge.net/viewvc/skype4py/Skype4Py/api/posix.py?view=patch&r1=277&r2=276&pathrev=277
+
+it could be also be python 2.6+ related:
+https://github.com/stigkj/Skype4Py/commit/431b3cee9b3ab72138af69f2ccef2aff0002deda.patch
+
+--- Skype4Py/api/posix.py      2009/09/24 14:59:43     276
++++ Skype4Py/api/posix.py      2009/09/26 12:21:04     277
+@@ -28,19 +28,8 @@
+ __all__ = ['SkypeAPI']
+ 
+ 
+-# the posix_x11 module has to be imported as soon as possible so it can initialize
+-# the X11 library; without this extra import it would be loaded during first Skype
+-# object instantiation; any possible exceptions are ignored because the module is
+-# not really needed at this point and the errors will be reported anyway during
+-# Skype object instantiation
+-try:
+-    import posix_x11
+-except:
+-    pass
+-
+-
+ def SkypeAPI(opts):
+-    trans = opts.pop('Transport', 'x11')
++    trans = opts.pop('Transport', 'dbus')
+     if trans == 'dbus':
+         from posix_dbus import SkypeAPI
+     elif trans == 'x11':

diff --git a/python-skype.spec b/python-skype.spec
index 98cb553b64e4867c0c632663232a6ea1fd86d71e..965ac1a51fd869ae092ce278cbf858f43f2d126d 100644 (file)
--- a/python-skype.spec
+++ b/python-skype.spec
@@ -2,7 +2,7 @@
 Summary:       Python wrapper for the Skype API
 Name:          python-%{module}
 Version:       1.0.32.0
-Release:       3
+Release:       4
 License:       BSD
 Group:         Development/Languages/Python
 Source0:       http://downloads.sourceforge.net/skype4py/Skype4Py-%{version}.tar.gz
@@ -11,6 +11,8 @@ Source1:      %{name}-chat.py
 Source2:       skype.protocol
 Source3:       skype.py
 Source4:       skype.schemas
+# http://skype4py.svn.sourceforge.net/viewvc/skype4py/Skype4Py/api/posix.py?view=patch&r1=277&r2=276&pathrev=277
+Patch0:                default-transport.patch
 URL:           http://sourceforge.net/projects/skype4py/
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
@@ -48,6 +50,7 @@ Gnome URL handler for "skype:" protocol.
 # workaround for stupid tarball lacking execute perms on dirs
 tar xzf %{SOURCE0}; chmod -R u+rwX .; mv Skype4Py-*/* .
 
+%patch -p0 -R
 %undos examples/*.py
 
 mv Skype4Py/LICENSE .