- updated to 0.9.35

diff --git a/calibre-locales.patch b/calibre-locales.patch
index 580afbc7c8161b3106a0f0c2ac7c4aac12151700..6e6b41d9db32677eac697c387a9ab69f974b75f9 100644 (file)
--- 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/calibre.spec b/calibre.spec
index 6965bcfc9421a8ad81cf292f86ed92ad95d7b83c..6cc3a686efbbc94b5b3b9b06c01c82409133bf12 100644 (file)
--- 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/shebang-python-fix.patch b/shebang-python-fix.patch
index 979dd4bb59f75d0b9a14e86dc2ae94527356ac22..a03d24649826ffcf138b5a9fada36b94a4948e88 100644 (file)
--- 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@kovidgoyal.net'