[calibre] Update to 0.8.3

[Kevin Fenzi]

commit 88ebd2b8ab44e0a9dc73d9ed0f1d48b5809241a4
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri May 27 20:39:30 2011 -0600

    Update to 0.8.3

 .gitignore             |    1 +
 calibre-manpages.patch |   34 +++++++++++++++++-----------------
 calibre.spec           |    7 +++++--
 sources                |    2 +-
 4 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 02022fd..e8dbe31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-0.8.0-nofonts.tar.xz
 /calibre-0.8.1-nofonts.tar.xz
 /calibre-0.8.2-nofonts.tar.xz
+/calibre-0.8.3-nofonts.tar.xz
diff --git a/calibre-manpages.patch b/calibre-manpages.patch
index 8cf30e7..42a56f5 100644
--- a/calibre-manpages.patch
+++ b/calibre-manpages.patch
@@ -1,37 +1,37 @@
-diff -up calibre/src/calibre/linux.py.manpages calibre/src/calibre/linux.py
---- calibre/src/calibre/linux.py.manpages	2010-04-10 19:34:42.632332811 +0300
-+++ calibre/src/calibre/linux.py	2010-04-10 19:34:50.404207554 +0300
-@@ -339,7 +339,7 @@ class PostInstall:
+diff -Nur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py
+--- calibre.orig/src/calibre/linux.py	2011-05-27 10:42:14.000000000 -0600
++++ calibre/src/calibre/linux.py	2011-05-27 20:06:53.461866793 -0600
+@@ -319,7 +319,7 @@
                      continue
                  parser = parser()
                  raw = create_man_page(prog, parser)
--                if isfreebsd:
-+                if isfreebsd or islinux:
+-                if isbsd:
++                if isbsd or islinux:
                      manfile = os.path.join(manpath, prog+'.1')
                  else:
                      manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
-diff -up calibre/src/calibre/utils/help2man.py.manpages calibre/src/calibre/utils/help2man.py
---- calibre/src/calibre/utils/help2man.py.manpages	2010-04-10 19:30:51.670926847 +0300
-+++ calibre/src/calibre/utils/help2man.py	2010-04-10 19:32:27.842332121 +0300
-@@ -4,7 +4,7 @@ __copyright__ = '2009, Kovid Goyal <kovi
+diff -Nur calibre.orig/src/calibre/utils/help2man.py calibre/src/calibre/utils/help2man.py
+--- calibre.orig/src/calibre/utils/help2man.py	2011-05-27 10:42:14.000000000 -0600
++++ calibre/src/calibre/utils/help2man.py	2011-05-27 20:08:28.314256418 -0600
+@@ -4,7 +4,7 @@
  __docformat__ = 'restructuredtext en'
  
  import time, bz2
--from calibre.constants import isfreebsd
-+from calibre.constants import isfreebsd, islinux
+-from calibre.constants import isbsd
++from calibre.constants import isbsd, islinux
  
  from calibre.constants import __version__, __appname__, __author__
  
-@@ -58,9 +58,7 @@ def create_man_page(prog, parser):
+@@ -58,9 +58,9 @@
      lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
              x in lines]
  
--    if not isfreebsd:
+-    if not isbsd:
 -        return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
 -    else:
-+    if isfreebsd or islinux:
++    if isbsd or islinux:
          return  (u'\n'.join(lines)).encode('utf-8')
--
--
 +    else:
 +        return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
+ 
+ 
diff --git a/calibre.spec b/calibre.spec
index 6d4e3b4..f781cfb 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.8.2
+Version:        0.8.3
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -19,7 +19,7 @@ URL:            http://calibre-ebook.com/
 Source0:        %{name}-%{version}-nofonts.tar.xz
 Source1:        generate-tarball.sh
 Source2:        calibre-mount-helper
-Patch0:         %{name}-manpages.patch
+Patch0:		%{name}-manpages.patch
 Patch1:         %{name}-no-update.patch
 # Patch to fix crash on pdf export (BZ #673604)
 # (use the correct API for the external pyPdf library)
@@ -279,6 +279,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/*
 
 %changelog
+* Fri May 27 2011 Kevin Fenzi <kevin at scrye.com> - 0.8.3-1
+- Update to 0.8.3
+
 * Sun May 22 2011 Kevin Fenzi <kevin at scrye.com> - 0.8.2-1
 - Update to 0.8.2
 
diff --git a/sources b/sources
index 893f7a4..4df3b16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56d74de7c56441fa6e7b945d7e133a99  calibre-0.8.2-nofonts.tar.xz
+1edee83e9920b4f5fdd91e8b0c7bd610  calibre-0.8.3-nofonts.tar.xz