- up to 2.12.5, currently fails to startup when scanning languages

Changed files:
    emesene.spec -> 1.26
    plugins-pyc.patch -> 1.3

diff --git a/emesene.spec b/emesene.spec
index 822dbf3a01f75032bb56a60547b8971977462c91..9a876a6c350e0c906c6e05cd50c2bbb834fa48fe 100644 (file)
--- a/emesene.spec
+++ b/emesene.spec
@@ -1,12 +1,14 @@
+# TODO
+# - gtk3
 Summary:       Instant messaging client for Windows Live Messenger (tm) network
 Name:          emesene
-Version:       2.12.1
-Release:       1
+Version:       2.12.5
+Release:       0.1
 License:       GPL v3 (emesene), GPL v2 (themes), LGPL (the rest)
 Group:         Applications/Networking
 URL:           http://www.emesene.org/
 Source0:       https://github.com/emesene/emesene/tarball/v%{version}/%{name}-%{version}.tgz
-# Source0-md5: 45dc07dd50e4748d4b2725a8c8d4c227
+# Source0-md5: 6444c0876e344ba6625195bf3701d2f4
 Patch0:                %{name}-desktop.patch
 Patch2:                plugins-pyc.patch
 Patch3:                pythonpath.patch
@@ -19,14 +21,17 @@ Requires:   %{name}-gui = %{version}-%{release}
 Requires:      alsa-utils
 Requires:      python
 Requires:      python
+#Requires:     python-crypto, python-openssl >= 0.6
 Requires:      python-dbus
 Requires:      python-gnome-extras
 Requires:      python-modules-sqlite
-Requires:      python-papyon >= 0.5.5
+#Requires:     python-papyon >= 0.5.5
 Requires:      python-pydns
-Requires:      python-pynotify
+Requires:      python-pygobject
 Requires:      python-xmpppy
 Suggests:      python-gnome-extras-gtkspell
+Suggests:      python-gstreamer
+Suggests:      python-gupnp-igd
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,7 +53,10 @@ Summary:     emesene GTK interface for emesene client
 Group:         Applications/Networking
 Requires:      %{name} = %{version}-%{release}
 Requires:      gtk+2
+Requires:      python-pycairo
 Requires:      python-pygtk-gtk >= 2:2.12
+Suggests:      python-pynotify
+Suggests:      python-pywebkitgtk
 Provides:      emesene-gui = %{version}-%{release}
 
 %description gtk2
@@ -75,7 +83,10 @@ mv *-emesene-*/* .
 # remove shebang
 %{__sed} -i -e '/^#!\//, 1d' emesene/test/e3_example.py emesene/extension.py \
        emesene/SingleInstance.py emesene/debugger.py emesene/emesene.py \
-       emesene/pluginmanager.py emesene/plugin_base.py
+       emesene/e3/common/pluginmanager.py emesene/plugin_base.py
+
+# using system pkg
+%{__rm} -r emesene/e3/papylib/papyon
 
 # skip debug provider
 %{__sed} -i -e '/import e3dummy/d' emesene/emesene.py
@@ -128,10 +139,11 @@ mv $RPM_BUILD_ROOT{%{py_sitescriptdir}/%{name}/*,%{_datadir}/%{name}}
 mv $RPM_BUILD_ROOT%{_datadir}/{%{name}/po,locale}
 
 # unsupported
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/kab
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/lb
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/nan
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/vec
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/kab
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/lb
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/mus
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/nan
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/vec
 
 %find_lang %{name}
 
@@ -150,15 +162,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_datadir}/%{name}/e3
 %{_datadir}/%{name}/e3/*.py[co]
-%{_datadir}/%{name}/e3/msn
 %{_datadir}/%{name}/e3/papylib
 %{_datadir}/%{name}/e3/base
 %{_datadir}/%{name}/e3/cache
 %{_datadir}/%{name}/e3/common
 %{_datadir}/%{name}/e3/dummy
-%{_datadir}/%{name}/e3/jabber
 %{_datadir}/%{name}/e3/synch
 
+%dir %{_datadir}/%{name}/e3/xmpp
+%{_datadir}/%{name}/e3/xmpp/*.py[co]
+%{_datadir}/%{name}/e3/xmpp/*.json
+%{_datadir}/%{name}/e3/xmpp/SleekXMPP
+%{_datadir}/%{name}/e3/xmpp/pyfb
+
 %dir %{_datadir}/%{name}/gui
 %{_datadir}/%{name}/gui/*.py[co]
 %{_datadir}/%{name}/gui/base

diff --git a/plugins-pyc.patch b/plugins-pyc.patch
index 62837a91b532d867cf2746678710b935d4517cbc..bb180ca090668838fb1c66bbe5fa8f20fc6060db 100644 (file)
--- a/plugins-pyc.patch
+++ b/plugins-pyc.patch
@@ -1,5 +1,5 @@
---- emesene-2.11.11/emesene/pluginmanager.py~  2011-11-22 18:00:09.000000000 +0200
-+++ emesene-2.11.11/emesene/pluginmanager.py   2011-11-22 18:02:42.495472765 +0200
+--- emesene-2.12.5/emesene/e3/common/pluginmanager.py~ 2012-06-18 22:22:03.000000000 +0300
++++ emesene-2.12.5/emesene/e3/common/pluginmanager.py  2012-06-18 22:22:46.818149193 +0300
 @@ -173,7 +173,7 @@
          for filename in os.listdir(dir_):
              path = os.path.join(dir_, filename)