- update to 2.11.11

Changed files:
    emesene-desktop.patch -> 1.4
    emesene.spec -> 1.20
    plugins-pyc.patch -> 1.2
    pythonpath.patch -> 1.2
    receivedFilesDir-writablecheck.patch -> 1.2
    setup-install.patch -> 1.2

diff --git a/emesene-desktop.patch b/emesene-desktop.patch
index a3c7c3090a27d14b986e01b6e75deed3f38535e7..e838995f8373531d2db050ec3d6b29028fb28781 100644 (file)
--- a/emesene-desktop.patch
+++ b/emesene-desktop.patch
@@ -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

diff --git a/emesene.spec b/emesene.spec
index 0588a2deb2ede1f8a7478f73543d9b6b52dc3e30..1cad10726e324f7dcb1cb085f98bdafab97b7adc 100644 (file)
--- a/emesene.spec
+++ b/emesene.spec
@@ -1,17 +1,15 @@
 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
@@ -23,9 +21,13 @@ Requires:    python
 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
@@ -42,13 +44,20 @@ normal MSN client except, file transfers, custom emoticons and display
 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
@@ -56,70 +65,83 @@ exec %{__python} %{_datadir}/%{name}/%{name} "$@"
 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
 
-%find_lang %{name}
+# 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
+
+# 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

diff --git a/plugins-pyc.patch b/plugins-pyc.patch
index 67e64e1fb0a84d947c89ca3e9b98e52c01098db5..62837a91b532d867cf2746678710b935d4517cbc 100644 (file)
--- a/plugins-pyc.patch
+++ b/plugins-pyc.patch
@@ -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 )
-         

diff --git a/pythonpath.patch b/pythonpath.patch
index 44b0291304d6446ac545e7289e763f48935ee884..df65f943c5bc3e4f724b30d31cced380f15a29ce 100644 (file)
--- a/pythonpath.patch
+++ b/pythonpath.patch
@@ -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

diff --git a/receivedFilesDir-writablecheck.patch b/receivedFilesDir-writablecheck.patch
deleted file mode 100644 (file)
index 59669c4..0000000
--- a/receivedFilesDir-writablecheck.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- emesene-1.6.2/FileTransfer.py~     2010-05-26 22:51:32.000000000 +0300
-+++ emesene-1.6.2/FileTransfer.py      2010-06-09 19:24:32.826629398 +0300
-@@ -215,8 +215,8 @@
-         receivedFilesDir = os.path.expanduser(config.user['receivedFilesDir'])
- 
-         # if directory is invalid, save to home directory
--        if not os.path.exists(receivedFilesDir):
--            print receivedFilesDir + ' does not exist. ' \
-+        if not os.path.exists(receivedFilesDir) or not os.access(receivedFilesDir, os.W_OK):
-+            print receivedFilesDir + ' does not exist or is not writable. ' \
-                 'Saving files to home directory.'
-             receivedFilesDir = os.path.expanduser('~/')
- 

diff --git a/setup-install.patch b/setup-install.patch
deleted file mode 100644 (file)
index eab00bd..0000000
--- a/setup-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- emesene-1.6/setup.py~      2010-01-04 18:26:30.000000000 +0200
-+++ emesene-1.6/setup.py       2010-03-21 12:05:27.413402672 +0200
-@@ -6,7 +6,7 @@
- 
- if os.name == 'posix':
-     for arg in sys.argv:
--        if arg == 'install': 
-+        if arg == 'install-warn':
-             print 'Hello.\nYou are trying to do a system-wide install of emesene '\
-                   'using this script, which is a very bad thing to do.\n'\
-                   'Seriously, you do NOT want to do this, since it can break '\