packages/emesene branch master updated.
draenog
draenog at pld-linux.org
Thu Jul 5 19:51:53 CEST 2012
The branch, master has been updated
via 7b2a2458fa196cb3381f4c8366192ec53bd37653 (commit)
via 152c25dffcaba9570d0b3d2e86a578e8fd844388 (commit)
via cd36bb2495063c626369c75aeca8f16aae7c27fa (commit)
via 34e0ff815be69dca895c9195e7280f9397992859 (commit)
via b84cc75e4e8e948413c7166b50c3d9649a98d3a2 (commit)
from b9ea2938363b79040a7ac8923f99a9c913466f0e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7b2a2458fa196cb3381f4c8366192ec53bd37653
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Thu Jul 5 17:34:40 2012 +0000
- msn works, so rel 1
Changed files:
emesene.spec -> 1.30
diff --git a/emesene.spec b/emesene.spec
index 5009f10..8dffaf6 100644
--- a/emesene.spec
+++ b/emesene.spec
@@ -3,7 +3,7 @@
Summary: Instant messaging client for Windows Live Messenger (tm) network
Name: emesene
Version: 2.12.5
-Release: 0.6
+Release: 1
License: GPL v3 (emesene), GPL v2 (themes), LGPL (the rest)
Group: Applications/Networking
URL: http://www.emesene.org/
commit 152c25dffcaba9570d0b3d2e86a578e8fd844388
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Thu Jul 5 17:30:59 2012 +0000
- 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
Changed files:
emesene.spec -> 1.29
no-dummy.patch -> 1.1
diff --git a/emesene.spec b/emesene.spec
index 07501d1..5009f10 100644
--- a/emesene.spec
+++ b/emesene.spec
@@ -3,7 +3,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/
@@ -13,6 +13,7 @@ Patch0: %{name}-desktop.patch
Patch2: plugins-pyc.patch
Patch3: pythonpath.patch
Patch4: locale-path.patch
+Patch5: no-dummy.patch
BuildRequires: gettext
BuildRequires: python-devel
BuildRequires: python-modules
@@ -81,6 +82,7 @@ mv *-emesene-*/* .
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# remove shebang
%{__sed} -i -e '/^#!\//, 1d' emesene/test/e3_example.py emesene/extension.py \
@@ -90,8 +92,8 @@ mv *-emesene-*/* .
# 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
@@ -168,7 +170,6 @@ rm -rf $RPM_BUILD_ROOT
%{_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
diff --git a/no-dummy.patch b/no-dummy.patch
new file mode 100644
index 0000000..6003136
--- /dev/null
+++ b/no-dummy.patch
@@ -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)
commit cd36bb2495063c626369c75aeca8f16aae7c27fa
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Thu Jul 5 17:11:12 2012 +0000
- use internal papyon, too much modifications to work on system one
Changed files:
emesene.spec -> 1.28
diff --git a/emesene.spec b/emesene.spec
index d150fc4..07501d1 100644
--- a/emesene.spec
+++ b/emesene.spec
@@ -3,7 +3,7 @@
Summary: Instant messaging client for Windows Live Messenger (tm) network
Name: emesene
Version: 2.12.5
-Release: 0.2
+Release: 0.3
License: GPL v3 (emesene), GPL v2 (themes), LGPL (the rest)
Group: Applications/Networking
URL: http://www.emesene.org/
@@ -88,7 +88,7 @@ mv *-emesene-*/* .
emesene/e3/common/pluginmanager.py emesene/plugin_base.py
# using system pkg
-%{__rm} -r emesene/e3/papylib/papyon
+#%{__rm} -r emesene/e3/papylib/papyon
# skip debug provider
%{__sed} -i -e '/import e3dummy/d' emesene/emesene.py
@@ -154,7 +154,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc CONTRIBUTORS COPYING README.developers README.markdown
+%doc CONTRIBUTORS COPYING DEPENDS README.developers README.markdown
%attr(755,root,root) %{_bindir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/data
commit 34e0ff815be69dca895c9195e7280f9397992859
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Thu Jul 5 17:03:18 2012 +0000
- fix locales finding
Changed files:
emesene.spec -> 1.27
locale-path.patch -> 1.1
diff --git a/emesene.spec b/emesene.spec
index 9a876a6..d150fc4 100644
--- a/emesene.spec
+++ b/emesene.spec
@@ -3,7 +3,7 @@
Summary: Instant messaging client for Windows Live Messenger (tm) network
Name: emesene
Version: 2.12.5
-Release: 0.1
+Release: 0.2
License: GPL v3 (emesene), GPL v2 (themes), LGPL (the rest)
Group: Applications/Networking
URL: http://www.emesene.org/
@@ -12,6 +12,7 @@ Source0: https://github.com/emesene/emesene/tarball/v%{version}/%{name}-%{versio
Patch0: %{name}-desktop.patch
Patch2: plugins-pyc.patch
Patch3: pythonpath.patch
+Patch4: locale-path.patch
BuildRequires: gettext
BuildRequires: python-devel
BuildRequires: python-modules
@@ -79,6 +80,7 @@ mv *-emesene-*/* .
%patch0 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# remove shebang
%{__sed} -i -e '/^#!\//, 1d' emesene/test/e3_example.py emesene/extension.py \
diff --git a/locale-path.patch b/locale-path.patch
new file mode 100644
index 0000000..cc416f7
--- /dev/null
+++ b/locale-path.patch
@@ -0,0 +1,11 @@
+--- emesene-2.12.5/emesene/Language.py~ 2012-07-05 19:58:24.000000000 +0300
++++ emesene-2.12.5/emesene/Language.py 2012-07-05 20:00:31.501276097 +0300
+@@ -108,7 +108,7 @@
+
+ self._default_locale = locale.getdefaultlocale()[0]
+ self._lang = os.getenv('LANGUAGE') or self._default_locale
+- self._locales_path = 'po/' if os.path.exists('po/') else None
++ self._locales_path = 'po/' if os.path.exists('po/') else '/usr/share/locale'
+
+ self._get_languages_list()
+
commit b84cc75e4e8e948413c7166b50c3d9649a98d3a2
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Thu Jul 5 16:59:17 2012 +0000
- 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 822dbf3..9a876a6 100644
--- 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 62837a9..bb180ca 100644
--- 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)
-----------------------------------------------------------------------
Summary of changes:
emesene.spec | 49 ++++++++++++++++++++++++++++++++++---------------
locale-path.patch | 11 +++++++++++
no-dummy.patch | 36 ++++++++++++++++++++++++++++++++++++
plugins-pyc.patch | 4 ++--
4 files changed, 83 insertions(+), 17 deletions(-)
create mode 100644 locale-path.patch
create mode 100644 no-dummy.patch
hooks/post-receive
--
packages/emesene
More information about the test
mailing list