[calibre/f13/master: 57/57] Merge branch 'master' into f13 Upgrade to 0.7.38

[chkr]

commit 30f3231ec8e61466f4df86c1c0c3947f113ca129
Merge: 8f970ae 6074d15
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Thu Jan 13 00:43:27 2011 +0100

    Merge branch 'master' into f13
    Upgrade to 0.7.38

 .gitignore                       |   26 +++++
 calibre-0.6.53-mounthelper.patch |   11 --
 calibre-cssprofiles.patch        |   15 ---
 calibre-executables.patch        |   12 --
 calibre-mount-helper             |    9 ++
 calibre-no-update.patch          |   50 ++++++---
 calibre.spec                     |  230 +++++++++++++++++++++++++++++++++-----
 generate-tarball.sh              |    3 +-
 sources                          |    2 +-
 9 files changed, 269 insertions(+), 89 deletions(-)
---
diff --cc .gitignore
index 33110dc,647744d..98a72a4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,26 +1,27 @@@
 +calibre-0.6.55-nofonts.tar.bz2
+ calibre-0.7.10-nofonts.tar.xz
+ calibre-0.7.11-nofonts.tar.xz
+ calibre-0.7.12-nofonts.tar.xz
+ calibre-0.7.13-nofonts.tar.xz
+ calibre-0.7.14-nofonts.tar.xz
+ /calibre-0.7.15-nofonts.tar.xz
+ /calibre-0.7.16-nofonts.tar.xz
+ /calibre-0.7.17-nofonts.tar.xz
+ /calibre-0.7.18-nofonts.tar.xz
+ /calibre-0.7.20-nofonts.tar.xz
+ /calibre-0.7.21-nofonts.tar.xz
+ /calibre-0.7.22-nofonts.tar.xz
+ /calibre-0.7.23-nofonts.tar.xz
+ /calibre-0.7.24-nofonts.tar.xz
+ /calibre-0.7.25-nofonts.tar.xz
+ /calibre-0.7.26-nofonts.tar.xz
+ /calibre-0.7.27-nofonts.tar.xz
+ /calibre-0.7.28-nofonts.tar.xz
+ /calibre-0.7.29-nofonts.tar.xz
+ /calibre-0.7.30-nofonts.tar.xz
+ /calibre-0.7.32-nofonts.tar.xz
+ /calibre-0.7.33-nofonts.tar.xz
+ /calibre-0.7.34-nofonts.tar.xz
+ /calibre-0.7.35-nofonts.tar.xz
+ /calibre-0.7.36-nofonts.tar.xz
+ /calibre-0.7.38-nofonts.tar.xz
diff --cc calibre.spec
index ced7c58,9879552..9406190
--- a/calibre.spec
+++ b/calibre.spec
@@@ -39,12 -38,14 +38,14 @@@ BuildRequires:  python-imagin
  BuildRequires:  xdg-utils
  BuildRequires:  python-BeautifulSoup
  BuildRequires:  chmlib-devel
 -BuildRequires:  python-cssutils > 0.9.6
 +BuildRequires:  python-cssutils
+ BuildRequires:  sqlite-devel
+ BuildRequires:  libicu-devel
  
  Requires:       PyQt4
  Requires:       pyPdf
  Requires:       python-cherrypy
--Requires:       python-cssutils
++Requires:       python-cssutils > 0.9.6
  Requires:       ImageMagick
  Requires:       odfpy
  Requires:       django-tagging