packages: calibre/calibre-locales.patch, calibre/calibre.spec - 0.8.16

[lisu]

Author: lisu                         Date: Sat Aug 27 11:03:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.8.16

---- Files affected:
packages/calibre:
   calibre-locales.patch (1.6 -> 1.7) , calibre.spec (1.108 -> 1.109) 

---- Diffs:

================================================================
Index: packages/calibre/calibre-locales.patch
diff -u packages/calibre/calibre-locales.patch:1.6 packages/calibre/calibre-locales.patch:1.7
--- packages/calibre/calibre-locales.patch:1.6	Mon Jul 18 14:01:35 2011
+++ packages/calibre/calibre-locales.patch	Sat Aug 27 13:03:26 2011
@@ -99,9 +99,9 @@
      if trans is None:
          return getattr(__builtins__, '_', lambda x: x)(text)
      return trans.ugettext(text)
---- calibre/setup/translations.py.orig	2011-07-15 18:54:35.000000000 +0200
-+++ calibre/setup/translations.py	2011-07-18 13:57:58.791853837 +0200
-@@ -132,7 +132,7 @@
+--- calibre/setup/translations.py.orig	2011-08-26 18:36:51.000000000 +0200
++++ calibre/setup/translations.py	2011-08-27 12:55:49.997229244 +0200
+@@ -131,7 +131,7 @@
  
      def mo_file(self, po_file):
          locale = os.path.splitext(os.path.basename(po_file))[0]
@@ -110,7 +110,7 @@
  
      def run(self, opts):
          for f in self.po_files():
-@@ -140,8 +140,9 @@
+@@ -139,8 +139,9 @@
              base = os.path.dirname(dest)
              if not os.path.exists(base):
                  os.makedirs(base)
@@ -119,11 +119,11 @@
 +            if self.newer(dest, f):
 +                self.info('\tCompiling translations for', locale)
 +                subprocess.check_call(['msgfmt', '-o', dest, f])
-             if locale in ('en_GB', 'en_CA', 'en_AU', 'si', 'ur', 'sc', 'ltg', 'nds', 'te', 'yi'):
-                 continue
-             pycountry = self.j(sysconfig.get_python_lib(), 'pycountry',
-@@ -157,16 +158,6 @@
-                 '\nDo you have pycountry installed?')
+             iscpo = {'bn':'bn_IN', 'zh_HK':'zh_CN'}.get(locale, locale)
+             iso639 = self.j(self.d(self.SRC), 'setup', 'iso_639',
+                     '%s.po'%iscpo)
+@@ -155,16 +156,6 @@
+                 self.warn('No ISO 639 translations for locale:', locale)
  
          self.write_stats()
 -        self.freeze_locales()

================================================================
Index: packages/calibre/calibre.spec
diff -u packages/calibre/calibre.spec:1.108 packages/calibre/calibre.spec:1.109
--- packages/calibre/calibre.spec:1.108	Wed Aug 24 13:12:54 2011
+++ packages/calibre/calibre.spec	Sat Aug 27 13:03:26 2011
@@ -12,12 +12,12 @@
 Summary:	E-book converter and library management
 Summary(pl.UTF-8):	Konwerter oraz biblioteka dla e-booków
 Name:		calibre
-Version:	0.8.15
+Version:	0.8.16
 Release:	1
 License:	GPL v3+
 Group:		Applications/Multimedia
 Source0:	%{name}-%{version}-nofonts.tar.xz
-# Source0-md5:	7e40667b1a72c5484827ebba2f206d8c
+# Source0-md5:	d85f2f193ecfcaef4ddd09e866a2a749
 Source1:	generate-tarball.sh
 Source2:	%{name}-mount-helper
 Patch0:		%{name}-prefix.patch
@@ -213,6 +213,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2011/08/27 11:03:26  lisu
+- 0.8.16
+
 Revision 1.108  2011/08/24 11:12:54  lisu
 - 0.8.15
 
================================================================

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