Author: glen Date: Mon Nov 28 11:58:13 2011 GMT Module: packages Tag: HEAD ---- Log message: - update to 2.11.11
---- Files affected: packages/emesene: emesene-desktop.patch (1.3 -> 1.4) , emesene.spec (1.19 -> 1.20) , plugins-pyc.patch (1.1 -> 1.2) , pythonpath.patch (1.1 -> 1.2) , receivedFilesDir-writablecheck.patch (1.1 -> NONE) (REMOVED), setup-install.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/emesene/emesene-desktop.patch diff -u packages/emesene/emesene-desktop.patch:1.3 packages/emesene/emesene-desktop.patch:1.4 --- packages/emesene/emesene-desktop.patch:1.3 Thu May 27 17:28:50 2010 +++ packages/emesene/emesene-desktop.patch Mon Nov 28 12:58:08 2011 @@ -1,10 +1,9 @@ ---- emesene-1.6/misc/emesene.desktop~ 2009-09-12 00:49:01.000000000 +0300 -+++ emesene-1.6/misc/emesene.desktop 2010-03-21 10:40:40.795856950 +0200 -@@ -1,7 +1,115 @@ +--- emesene-2.11.11/emesene/data/share/applications/emesene.desktop~ 2011-11-12 22:07:06.000000000 +0200 ++++ emesene-2.11.11/emesene/data/share/applications/emesene.desktop 2011-11-22 17:58:09.502884977 +0200 +@@ -1,6 +1,61 @@ [Desktop Entry] --Name=Emesene --GenericName=Emesene --Comment=MSN Messenger client +-Name=emesene +-GenericName=emesene +Name=Emesene Instant Messenger +GenericName=Instant Messenger +GenericName[ar]=المرسال الفوري @@ -62,60 +61,6 @@ +GenericName[zh_CN]=即时通讯客户程序 +GenericName[zh_HK]=即時通訊程式 +GenericName[zh_TW]=即時訊息客戶端程式 -+Comment=Instant Messenger -+Comment[ar]=المرسال الفوري -+Comment[be]=Праграма імгненных паведамленняў -+Comment[bg]=Съобщения в реално време -+Comment[bn]=তাত্ক্ষণিক বার্তাবাহক -+Comment[br]=Posteler a-benn-kaer -+Comment[bs]=Instant poruke -+Comment[ca]=Missatger a l'instant -+Comment[cs]=Komunikátor -+Comment[cy]=Negesydd Chwim -+Comment[el]=Στιγμιαίος αποστολέας μηνυμάτων -+Comment[eo]=Rapidmesaĝilo -+Comment[es]=Mensajería instantánea -+Comment[et]=Kiirsuhtlusrakendus -+Comment[eu]=Berehalako mezularitza -+Comment[fa]=پیامرسان فوری -+Comment[fi]=Pikaviestinohjelma -+Comment[fr]=Messagerie instantanée -+Comment[gl]=Mensaxería Instantánea -+Comment[he]=תוכנת מסרים מידיים -+Comment[hi]=इंस्टैंट मैसेंजर -+Comment[hr]=Instant poruke -+Comment[hu]=Azonnali üzenetküldő -+Comment[is]=Spjallforrit -+Comment[it]=Messaggistica istantanea -+Comment[ja]=インスタントメッセンジャー -+Comment[kk]=Жедел хабарласу бағдарламасы -+Comment[km]=កម្មវិធីផ្ញើសារបន្ទាន់ -+Comment[lt]=Momentinių žinučių klientas -+Comment[mk]=Инстант гласник -+Comment[nb]=hurtigmeldingssystem -+Comment[nds]=Kortnarichtenprogramm -+Comment[ne]=तत्काल मेसेन्जर -+Comment[nl]=Instant messenger -+Comment[nn]=Lynmeldingsprogram -+Comment[pl]=Komunikator -+Comment[pt]=Mensageiro Instantâneo -+Comment[pt_BR]=Mensageiro Instantâneo -+Comment[ro]=Mesaje instantanee -+Comment[ru]=Программа обмена сообщениями -+Comment[se]=Instant Messenger-klienta -+Comment[sl]=Takojšni sporočilnik -+Comment[sr]=Брзи гласник -+Comment[sr@Latn]=Brzi glasnik -+Comment[sv]=Direktmeddelandeklient -+Comment[ta]=உடனடி தூதர் -+Comment[tg]=Пайёмбари Фаврӣ -+Comment[tr]=Anında Haberleşme Hizmeti -+Comment[uk]=Програма для миттєвого зв'язку -+Comment[uz]=Xabar almashish vositasi -+Comment[uz@cyrillic]=Хабар алмашиш воситаси -+Comment[zh_CN]=即时通讯客户程序 -+Comment[zh_HK]=即時通訊程式 -+Comment[zh_TW]=即時訊息客戶端程式 + Comment=Instant messaging client for MSN, Gtalk and Facebook Exec=emesene Icon=emesene - Terminal=false ================================================================ Index: packages/emesene/emesene.spec diff -u packages/emesene/emesene.spec:1.19 packages/emesene/emesene.spec:1.20 --- packages/emesene/emesene.spec:1.19 Tue Sep 21 20:59:49 2010 +++ packages/emesene/emesene.spec Mon Nov 28 12:58:08 2011 @@ -1,18 +1,16 @@ # $Revision$, $Date$ Summary: Instant messaging client for Windows Live Messenger (tm) network Name: emesene -Version: 1.6.3 -Release: 2 -License: GPL v2+ +Version: 2.11.11 +Release: 0.1 +License: GPL v3 (emesene), GPL v2 (themes), LGPL (the rest) Group: Applications/Networking URL: http://www.emesene.org/ -Source0: http://downloads.sourceforge.net/project/emesene/%{name}-%{version}/emesene-%{version}.tar.gz -# Source0-md5: 0d57f88a1f10a209f9f4552a78c6b965 +Source0: https://github.com/emesene/emesene/tarball/v2.11.11/%{name}-%{version}.tgz +# Source0-md5: eb818e886d6c85a293fc640341d1ad44 Patch0: %{name}-desktop.patch -Patch1: setup-install.patch Patch2: plugins-pyc.patch Patch3: pythonpath.patch -Patch4: receivedFilesDir-writablecheck.patch BuildRequires: gettext BuildRequires: python-devel BuildRequires: python-modules @@ -24,9 +22,13 @@ Requires: python Requires: python-dbus Requires: python-gnome-extras +Requires: python-papyon >= 0.5.5 +Requires: python-pydns Requires: python-pygtk-gtk Requires: python-pynotify +Requires: python-xmpppy Suggests: python-gnome-extras-gtkspell +BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -43,13 +45,20 @@ picture. %prep -%setup -q +%setup -qc +mv *-emesene-*/* . %undos -f py %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 + +# 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 + +# cleanup backups after patching +find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f cat <<'EOF' > emesene.sh #!/bin/sh @@ -57,73 +66,86 @@ EOF # fix #!%{_bindir}/env python -> #!%{__python}: -%{__sed} -i -e '1s,^#!.*python,#!%{__python},' emesene Controller.py +%{__sed} -i -e '1s,^#!.*python,#!%{__python},' emesene/emesene # lib64 path -%{__sed} -i -e 's,/usr/lib/emesene,%{_libdir}/%{name},' emesene - -# win32 only -rm -f themes/*/trayicon.ico -v - -# po/nb already exists, so just rm -rm -r po/nb_NO +%{__sed} -i -e 's,/usr/lib/emesene,%{_libdir}/%{name},' emesene/emesene %build -%{__python} setup.py build_ext -i +%{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_libdir}/%{name}} +install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_bindir}} %{__python} setup.py install \ + --skip-build \ --optimize=2 \ --root=$RPM_BUILD_ROOT %py_postclean -mv $RPM_BUILD_ROOT{%{py_sitedir}/libmimic.so,%{_libdir}/%{name}} -mv $RPM_BUILD_ROOT{%{_bindir}/%{name},%{_datadir}/%{name}} -rm $RPM_BUILD_ROOT%{py_sitedir}/emesene-*.egg-info -mv $RPM_BUILD_ROOT{%{py_sitedir}/*,%{_datadir}/%{name}} -rm $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/emesene.svg install -p %{name}.sh $RPM_BUILD_ROOT%{_bindir}/%{name} +%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}-*.egg-info +mv $RPM_BUILD_ROOT{%{py_sitescriptdir}/%{name}/*,%{_datadir}/%{name}} + +# unwanted +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/test +%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/documentation.epydoc +%{__rm} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/%{name}.svg +%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/lintreport.sh +%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}/.doxygen + +# duplicates +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/data/pixmaps +%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/data/icons/hicolor/*/apps/emesene.png +%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/data/icons/hicolor/scalable/apps/emesene.svg +%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/data/share/applications/emesene.desktop -%find_lang %{name} +# TODO: relocate +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/po + +#%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +#%files -f %{name}.lang +%files %defattr(644,root,root,755) -%doc COPYING +%doc CONTRIBUTORS COPYING README.developers README.markdown %attr(755,root,root) %{_bindir}/emesene -%dir %{_libdir}/%{name} -%attr(755,root,root) %{_libdir}/%{name}/libmimic.so %dir %{_datadir}/%{name} -%attr(755,root,root) %{_datadir}/%{name}/emesene +%dir %{_datadir}/%{name}/data +%{_datadir}/%{name}/emesene %{_datadir}/%{name}/*.py[co] -%{_datadir}/%{name}/hotmlog.htm -%{_datadir}/%{name}/plugins_base -%{_datadir}/%{name}/abstract -%{_datadir}/%{name}/emesenelib -%dir %{_datadir}/%{name}/conversation_themes -%{_datadir}/%{name}/conversation_themes/default -%{_datadir}/%{name}/conversation_themes/gtalk -%{_datadir}/%{name}/conversation_themes/irc -%{_datadir}/%{name}/conversation_themes/messenger -%{_datadir}/%{name}/conversation_themes/pidgin -%dir %{_datadir}/%{name}/smilies -%{_datadir}/%{name}/smilies/default -%dir %{_datadir}/%{name}/sound_themes -%{_datadir}/%{name}/sound_themes/default -%{_datadir}/%{name}/sound_themes/freedesktop +%{_datadir}/%{name}/data/hotmlog.htm + +%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 + +%{_datadir}/%{name}/gui +%{_datadir}/%{name}/interfaces +%{_datadir}/%{name}/plugins + %dir %{_datadir}/%{name}/themes -%{_datadir}/%{name}/themes/default -%{_datadir}/%{name}/themes/gnomecolors -%{_datadir}/%{name}/themes/inthemargins -%{_datadir}/%{name}/themes/tango +%{_datadir}/%{name}/themes/conversations +%{_datadir}/%{name}/themes/emotes +%{_datadir}/%{name}/themes/images +%{_datadir}/%{name}/themes/sounds + %{_mandir}/man1/emesene.1* %{_desktopdir}/emesene.desktop %{_pixmapsdir}/emesene.png +%{_pixmapsdir}/emesene.xpm +%{_iconsdir}/hicolor/*/apps/emesene.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -131,6 +153,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.20 2011/11/28 11:58:08 glen +- update to 2.11.11 + Revision 1.19 2010/09/21 18:59:49 glen - release 2 ================================================================ Index: packages/emesene/plugins-pyc.patch diff -u packages/emesene/plugins-pyc.patch:1.1 packages/emesene/plugins-pyc.patch:1.2 --- packages/emesene/plugins-pyc.patch:1.1 Sun Mar 21 12:19:54 2010 +++ packages/emesene/plugins-pyc.patch Mon Nov 28 12:58:08 2011 @@ -1,13 +1,11 @@ ---- emesene-1.6/PluginManager.py~ 2009-12-24 14:55:03.000000000 +0200 -+++ emesene-1.6/PluginManager.py 2010-03-21 13:11:23.769597184 +0200 -@@ -92,8 +92,8 @@ - path = path + paths.DIR_SEP + package +--- 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 +@@ -173,7 +173,7 @@ + for filename in os.listdir(dir_): + path = os.path.join(dir_, filename) + if filename.startswith(".") or \ +- not (os.path.isdir(path) or filename.endswith('.py')) or \ ++ not (os.path.isdir(path) or filename.endswith('.py') or filename.endswith('.pyc')) or \ + filename in BLACKLIST: + continue - modules = [ x.split( '.' )[ 0 ] for x in os.listdir( path ) \ -- if x.endswith( '.py' ) and not x.startswith( '_' ) \ -- and x != 'Plugin.py' ] -+ if (x.endswith( '.py' ) or x.endswith ('.pyc')) and not x.startswith( '_' ) \ -+ and x != 'Plugin.py' and x != 'Plugin.pyc' ] - plugins = {} - plugins = plugins.fromkeys( modules ) - ================================================================ Index: packages/emesene/pythonpath.patch diff -u packages/emesene/pythonpath.patch:1.1 packages/emesene/pythonpath.patch:1.2 --- packages/emesene/pythonpath.patch:1.1 Sun Mar 21 12:30:58 2010 +++ packages/emesene/pythonpath.patch Mon Nov 28 12:58:08 2011 @@ -1,5 +1,5 @@ ---- emesene-1.5/emesene.pythonpath 2009-08-25 10:09:10.052277308 -0300 -+++ emesene-1.5/emesene 2009-08-25 10:09:54.330009511 -0300 +--- emesene-1.5/emesene/emesene.pythonpath 2009-08-25 10:09:10.052277308 -0300 ++++ emesene-1.5/emesene/emesene 2009-08-25 10:09:54.330009511 -0300 @@ -17,6 +17,9 @@ # along with emesene; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emesene/emesene-desktop.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emesene/emesene.spec?r1=1.19&r2=1.20&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emesene/plugins-pyc.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emesene/pythonpath.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
