[packages/calibre] - updated to 0.9.35

baggins baggins at pld-linux.org
Fri Jun 14 13:52:28 CEST 2013


commit 6b37bdf6933f77d78ff242c29b24030d34b45156
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jun 14 13:52:20 2013 +0200

    - updated to 0.9.35

 calibre-locales.patch    | 9 ++++++++-
 calibre.spec             | 9 +++++----
 shebang-python-fix.patch | 8 --------
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/calibre.spec b/calibre.spec
index 6965bcf..6cc3a68 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -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.9.6
-Release:	2
+Version:	0.9.35
+Release:	0.1
 License:	GPL v3+
 Group:		Applications/Multimedia
 Source0:	%{name}-%{version}-nofonts.tar.xz
-# Source0-md5:	ff267abb7de29866f7f5565ce10e2b7b
+# Source0-md5:	587fe0f85603067c0f11f0e3318fa3c6
 Source1:	generate-tarball.sh
 Source2:	%{name}-mount-helper
 Patch0:		%{name}-prefix.patch
@@ -48,6 +48,7 @@ BuildRequires:	python-lxml
 BuildRequires:	python-mechanize
 BuildRequires:	python-modules-sqlite
 BuildRequires:	python-sip-devel
+BuildRequires:	qt4-devel-private
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.586
 BuildRequires:	sed >= 4.0
@@ -136,7 +137,7 @@ rm -f resources/localization/locales.zip
 %build
 CC="%{__cc}" \
 CXX=%{__cxx} \
-OVERRIDE_CFLAGS="%{rpmcflags}" \
+OVERRIDE_CFLAGS="%{rpmcflags} -I/usr/include/qt4/private" \
 OVERRIDE_LDFLAGS="%{rpmldflags}" \
 %{__python} setup.py build
 
diff --git a/calibre-locales.patch b/calibre-locales.patch
index 580afbc..6e6b41d 100644
--- a/calibre-locales.patch
+++ b/calibre-locales.patch
@@ -115,11 +115,18 @@
              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 @@
+@@ -155,7 +156,6 @@
                  self.warn('No ISO 639 translations for locale:', locale)
  
          self.write_stats()
 -        self.freeze_locales()
+ 
+     def check_iso639(self, path):
+         from calibre.utils.localization import langnames_to_langcodes
+@@ -165,15 +166,6 @@
+                             os.path.basename(path), msgstr, msgid, rmap[msgstr]))
+                     # raise SystemExit(1)
+                 rmap[msgstr] = msgid
 -
 -    def freeze_locales(self):
 -        zf = self.DEST + '.zip'
diff --git a/shebang-python-fix.patch b/shebang-python-fix.patch
index 979dd4b..a03d246 100644
--- a/shebang-python-fix.patch
+++ b/shebang-python-fix.patch
@@ -17,11 +17,3 @@
  
  """
  This is the standard runscript for all of calibre's tools.
---- calibre/src/calibre/trac/bzr_commit_plugin.py~	2011-03-26 02:30:09.000000000 +0100
-+++ calibre/src/calibre/trac/bzr_commit_plugin.py	2011-03-29 09:32:22.581633113 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env  python2
-+#!/usr/bin/env  python
- 
- __license__   = 'GPL v3'
- __copyright__ = '2008, Kovid Goyal kovid at kovidgoyal.net'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/calibre.git/commitdiff/6b37bdf6933f77d78ff242c29b24030d34b45156



More information about the pld-cvs-commit mailing list