- up to 2.74.0

diff --git a/calibre-locales.patch b/calibre-locales.patch
index 698ac39ff2232f83ec3486a6ec28141e008aead5..a35a01e764d415ca18211990a5fdf20ca2ce082a 100644 (file)
--- a/calibre-locales.patch
+++ b/calibre-locales.patch
@@ -9,24 +9,14 @@
  
      def run(self, opts):
          self.iso639_errors = []
-@@ -152,7 +152,8 @@ class Translations(POT):  # {{{
-             base = os.path.dirname(dest)
-             if not os.path.exists(base):
-                 os.makedirs(base)
--            jobs.append(['msgfmt', '-o', dest, f])
-+            if self.newer(dest, f):
-+                jobs.append(['msgfmt', '-o', dest, f])
-             iscpo = {'bn':'bn_IN', 'zh_HK':'zh_CN'}.get(locale, locale)
-             iso639 = self.j(self.LP_ISO_PATH, '%s.po'%iscpo)
- 
 @@ -174,7 +175,6 @@ class Translations(POT):  # {{{
-             raise SystemExit(1)
- 
-         self.write_stats()
+     def run(self, opts):
+         self.compile_main_translations()
+         self.compile_content_server_translations()
 -        self.freeze_locales()
          self.compile_user_manual_translations()
  
-     def check_iso639(self, path):
+     def compile_group(self, files, handle_stats=None, file_ok=None, action_per_file=None):
 @@ -198,15 +198,6 @@ class Translations(POT):  # {{{
                      # raise SystemExit(1)
                  rmap[msgstr] = msgid
@@ -79,9 +69,9 @@
      return trans.ugettext(text)
 --- calibre/src/calibre/utils/localization.py.wiget    2013-12-06 05:13:34.000000000 +0100
 +++ calibre/src/calibre/utils/localization.py  2013-12-09 09:31:05.694326467 +0100
-@@ -74,20 +74,20 @@ def get_lang():
-         lang = 'en'
-     return lang
+@@ -74,21 +74,20 @@ def get_lang():
+     return get_lang()[:2].lower() in {'he', 'ar'}
+ 
  
 +def messages_path(lang):
 +    return ('/usr/share/locale/%s/LC_MESSAGES'%lang)
@@ -97,6 +87,7 @@
 -                hlang = xlang
 -    return hlang
 -
+-
 -def zf_exists():
 -    return os.path.exists(P('localization/locales.zip',
 -                allow_user_override=False))

diff --git a/calibre.spec b/calibre.spec
index 27e9606835abae4511cd0c4244814092fa7203e6..d70af7cd99f1aee07905751557b39edabd3b2ad0 100644 (file)
--- a/calibre.spec
+++ b/calibre.spec
@@ -11,12 +11,12 @@
 Summary:       E-book converter and library management
 Summary(pl.UTF-8):     Konwerter oraz biblioteka dla e-booków
 Name:          calibre
-Version:       2.52.0
-Release:       2
+Version:       2.74.0
+Release:       1
 License:       GPL v3+
 Group:         Applications/Multimedia
 Source0:       %{name}-%{version}-nofonts.tar.xz
-# Source0-md5: edac53242c434d94dc002d19a7b0cb8a
+# Source0-md5: b01b92dbb654fd64462ce0010e38d24e
 Source1:       generate-tarball.sh
 Source2:       %{name}-mount-helper
 Patch0:                %{name}-prefix.patch