packages: emesene/emesene.spec, emesene/no-dummy.patch (NEW)=?UTF-8?Q?=20?=- avoid loadin...

[glen]

Author: glen                         Date: Thu Jul  5 17:31:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid loading and packaging dummy provider, as if papyon library fails to
  load you will be presented with such colorful contact list:
  https://dl.dropbox.com/u/8879577/ss/msn-emesene.png which scares hell out of
  you thinking how did you msn id got leaked

---- Files affected:
packages/emesene:
   emesene.spec (1.28 -> 1.29) , no-dummy.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/emesene/emesene.spec
diff -u packages/emesene/emesene.spec:1.28 packages/emesene/emesene.spec:1.29
--- packages/emesene/emesene.spec:1.28	Thu Jul  5 19:11:12 2012
+++ packages/emesene/emesene.spec	Thu Jul  5 19:30:59 2012
@@ -4,7 +4,7 @@
 Summary:	Instant messaging client for Windows Live Messenger (tm) network
 Name:		emesene
 Version:	2.12.5
-Release:	0.3
+Release:	0.6
 License:	GPL v3 (emesene), GPL v2 (themes), LGPL (the rest)
 Group:		Applications/Networking
 URL:		http://www.emesene.org/
@@ -14,6 +14,7 @@
 Patch2:		plugins-pyc.patch
 Patch3:		pythonpath.patch
 Patch4:		locale-path.patch
+Patch5:		no-dummy.patch
 BuildRequires:	gettext
 BuildRequires:	python-devel
 BuildRequires:	python-modules
@@ -82,6 +83,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # remove shebang
 %{__sed} -i -e '/^#!\//, 1d' emesene/test/e3_example.py emesene/extension.py \
@@ -91,8 +93,8 @@
 # using system pkg
 #%{__rm} -r emesene/e3/papylib/papyon
 
-# skip debug provider
-%{__sed} -i -e '/import e3dummy/d' emesene/emesene.py
+# skip test provider
+%{__rm} -r emesene/e3/dummy
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -169,7 +171,6 @@
 %{_datadir}/%{name}/e3/base
 %{_datadir}/%{name}/e3/cache
 %{_datadir}/%{name}/e3/common
-%{_datadir}/%{name}/e3/dummy
 %{_datadir}/%{name}/e3/synch
 
 %dir %{_datadir}/%{name}/e3/xmpp
@@ -212,6 +213,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2012/07/05 17:30:59  glen
+- avoid loading and packaging dummy provider, as if papyon library fails to
+  load you will be presented with such colorful contact list:
+  https://dl.dropbox.com/u/8879577/ss/msn-emesene.png which scares hell out of
+  you thinking how did you msn id got leaked
+
 Revision 1.28  2012/07/05 17:11:12  glen
 - use internal papyon, too much modifications to work on system one
 

================================================================
Index: packages/emesene/no-dummy.patch
diff -u /dev/null packages/emesene/no-dummy.patch:1.1
--- /dev/null	Thu Jul  5 19:31:04 2012
+++ packages/emesene/no-dummy.patch	Thu Jul  5 19:30:59 2012
@@ -0,0 +1,36 @@
+--- emesene-2.12.5/emesene/emesene.py~	2012-07-05 20:22:24.000000000 +0300
++++ emesene-2.12.5/emesene/emesene.py	2012-07-05 20:26:32.796531143 +0300
+@@ -80,7 +80,6 @@
+ log = logging.getLogger('emesene')
+ 
+ import e3
+-from e3 import dummy
+ 
+ try:
+     from e3.common.DBus import DBusController
+@@ -169,17 +168,12 @@
+ 
+     def _setup(self):
+         '''register core extensions'''
+-        extension.category_register('session', dummy.Session,
+-                single_instance=True)
+         if xmpp is not None:
+             extension.register('session', xmpp.Session)
+-        extension.register('session', dummy.Session)
+ 
+         if papylib is not None:
+             extension.register('session', papylib.Session)
+             extension.set_default('session', papylib.Session)
+-        else:
+-            extension.set_default('session', dummy.Session)
+ 
+         #DBus extension stuffs
+         if DBusController is not None:
+@@ -755,7 +749,6 @@
+     """
+     the main method of emesene
+     """
+-    extension.category_register('session', dummy.Session, single_instance=True)
+     extension.category_register('option provider', None,
+             interfaces=interfaces.IOptionProvider)
+     extension.register('quit', sys.exit)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/emesene/emesene.spec?r1=1.28&r2=1.29