packages: calibre/calibre-locales.patch, calibre/calibre.spec - up to 0.8.35

[lisu]

Author: lisu                         Date: Tue Jan 17 08:47:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.8.35

---- Files affected:
packages/calibre:
   calibre-locales.patch (1.7 -> 1.8) , calibre.spec (1.130 -> 1.131) 

---- Diffs:

================================================================
Index: packages/calibre/calibre-locales.patch
diff -u packages/calibre/calibre-locales.patch:1.7 packages/calibre/calibre-locales.patch:1.8
--- packages/calibre/calibre-locales.patch:1.7	Sat Aug 27 13:03:26 2011
+++ packages/calibre/calibre-locales.patch	Tue Jan 17 09:47:48 2012
@@ -1,19 +1,11 @@
---- calibre/src/calibre/utils/localization.py.orig      2011-07-15 18:54:35.000000000 +0200
-+++ calibre/src/calibre/utils/localization.py   2011-07-18 13:53:51.356353825 +0200
-@@ -8,7 +8,6 @@
-
- import os, locale, re, cStringIO, cPickle
- from gettext import GNUTranslations, NullTranslations
--from zipfile import ZipFile
-
- _available_translations = None
-
-@@ -50,20 +49,20 @@
+--- calibre/src/calibre/utils/localization.py~	2012-01-13 05:32:13.000000000 +0100
++++ calibre/src/calibre/utils/localization.py	2012-01-17 09:35:01.311333439 +0100
+@@ -49,20 +49,20 @@
          lang = 'en'
      return lang
-
-+def messages_path(lang):
-+    return ('/usr/share/locale/%s/LC_MESSAGES'%lang)
+ 
++    def messages_path(lang):
++        return ('/usr/share/locale/%s/LC_MESSAGES'%lang)
 +
  def get_lc_messages_path(lang):
      hlang = None
@@ -35,16 +27,17 @@
 +        xlang = lang.split('_')[0]
 +        if xlang in available_translations():
 +            hlang = xlang
-+    if hlang is not None:
-+        return messages_path(hlang)
-+    return None
-
++        if hlang is not None:
++            return messages_path(hlang)
++        return None
+ 
  def set_translators():
      # To test different translations invoke as
-@@ -79,17 +78,12 @@
-
-         mpath = get_lc_messages_path(lang)
+@@ -84,18 +84,12 @@
+                 buf = cStringIO.StringIO(buf.getvalue())
+ 
          if mpath is not None:
+-            from zipfile import ZipFile
 -            with ZipFile(P('localization/locales.zip',
 -                allow_user_override=False), 'r') as zf:
 -                if buf is None:
@@ -62,24 +55,24 @@
 +            isof = os.path.join(mpath, 'calibre_iso639.mo')
 +            if os.path.exists(isof):
 +                iso639 = open(isof, 'rb')
-
+ 
          t = None
          if buf is not None:
---- calibre/src/calibre/translations/dynamic.py~	2011-06-24 20:01:27.000000000 +0200
-+++ calibre/src/calibre/translations/dynamic.py	2011-06-29 10:37:52.305747266 +0200
-@@ -5,9 +5,10 @@
+--- calibre/src/calibre/translations/dynamic.py.orig    2012-01-13 05:32:13.000000000 +0100
++++ calibre/src/calibre/translations/dynamic.py 2012-01-17 09:37:53.594649557 +0100
+@@ -5,10 +5,10 @@
  __license__   = 'GPL v3'
  __copyright__ = '2008, Marshall T. Vandegrift <llasram at gmail.com>'
- 
+
 +import os
  import cStringIO
  from gettext import GNUTranslations
--from calibre.utils.localization import get_lc_messages_path, ZipFile
-+from calibre.utils.localization import get_lc_messages_path
- 
+ from calibre.utils.localization import get_lc_messages_path
+-from zipfile import ZipFile
+
  __all__ = ['translate']
- 
-@@ -20,15 +21,10 @@
+
+@@ -21,15 +21,10 @@
      else:
          mpath = get_lc_messages_path(lang)
          if mpath is not None:
@@ -92,10 +85,10 @@
 -                else:
 -                    trans = GNUTranslations(buf)
 -                    _CACHE[lang] = trans
-+    	    p = os.path.join(mpath, 'messages.mo')
-+	    if os.path.exists(p):
-+		trans = GNUTranslations(open(p, 'rb'))
-+		_CACHE[lang] = trans
++           p = os.path.join(mpath, 'messages.mo')
++           if os.path.exists(p):
++               trans = GNUTranslations(open(p, 'rb'))
++               _CACHE[lang] = trans
      if trans is None:
          return getattr(__builtins__, '_', lambda x: x)(text)
      return trans.ugettext(text)

================================================================
Index: packages/calibre/calibre.spec
diff -u packages/calibre/calibre.spec:1.130 packages/calibre/calibre.spec:1.131
--- packages/calibre/calibre.spec:1.130	Fri Jan  6 18:19:08 2012
+++ packages/calibre/calibre.spec	Tue Jan 17 09:47:48 2012
@@ -13,12 +13,12 @@
 Summary:	E-book converter and library management
 Summary(pl.UTF-8):	Konwerter oraz biblioteka dla e-booków
 Name:		calibre
-Version:	0.8.34
+Version:	0.8.35
 Release:	1
 License:	GPL v3+
 Group:		Applications/Multimedia
 Source0:	%{name}-%{version}-nofonts.tar.xz
-# Source0-md5:	d667888c652de47f271ed09ea9e11935
+# Source0-md5:	4121362ab8df97a534512908bc940566
 Source1:	generate-tarball.sh
 Source2:	%{name}-mount-helper
 Patch0:		%{name}-prefix.patch
@@ -217,6 +217,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.131  2012/01/17 08:47:48  lisu
+- up to 0.8.35
+
 Revision 1.130  2012/01/06 17:19:08  lisu
 - 0.8.34
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/calibre/calibre-locales.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/calibre/calibre.spec?r1=1.130&r2=1.131&f=u