From a422536e1ba326bff507ba81859c784a135d1804 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Mon, 30 May 2011 22:48:08 +0000
Subject: Mon May 30 22:48:08 UTC 2011

---
 community/calibre/PKGBUILD                  | 10 +++++-----
 community/calibre/desktop_integration.patch | 14 ++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'community/calibre')

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 9ec165ff9..7d368870d 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47955 2011-05-26 11:34:38Z giovanni $
+# $Id: PKGBUILD 48179 2011-05-29 13:13:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.2
-pkgrel=2
+pkgver=0.8.3
+pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
@@ -20,8 +20,8 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
-md5sums=('e64c92ccf29ac17bfaf4a296e17a38ba'
-         'bcc538a3b004429bf8f5a0ac1d89a37f')
+md5sums=('aee05cac444f68491f2a3d68b22da53e'
+         'f4b80e3b34e34bce68b3f052ff52dee8')
 
 build() {
   cd "${srcdir}/${pkgname}"
diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch
index fa58443ed..40d48c03e 100644
--- a/community/calibre/desktop_integration.patch
+++ b/community/calibre/desktop_integration.patch
@@ -1,7 +1,6 @@
-diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py
---- calibre.orig//src/calibre/linux.py	2010-09-17 22:38:02.000000000 +0200
-+++ calibre/src/calibre/linux.py	2010-09-19 15:50:15.029705851 +0200
-@@ -334,52 +323,39 @@ class PostInstall:
+--- a/src/calibre/linux.py	2011-05-27 18:42:14.000000000 +0200
++++ b/src/calibre/linux.py	2011-05-29 14:57:49.000000000 +0200
+@@ -340,51 +340,39 @@
  
              with TemporaryDirectory() as tdir:
                  with CurrentDir(tdir):
@@ -26,7 +25,7 @@ diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py
                      mimetypes = set([])
                      for x in all_input_formats():
                          mt = guess_type('dummy.'+x)[0]
--                        if mt and 'chemical' not in mt:
+-                        if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
 +                        if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
                              mimetypes.add(mt)
  
@@ -52,11 +51,10 @@ diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py
 -                    des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
 -                            'calibre-ebook-viewer.desktop')
 -                    for x in des:
--                        cmd = ['xdg-desktop-menu', 'install', './'+x]
--                        if x != des[-1]:
--                            cmd.insert(2, '--noupdate')
+-                        cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
 -                        check_call(' '.join(cmd), shell=True)
 -                        self.menu_resources.append(x)
+-                    check_call(['xdg-desktop-menu', 'forceupdate'])
 -                    f = open('calibre-mimetypes', 'wb')
 +                    dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
 +                    os.makedirs(dir)
-- 
cgit v1.2.3-54-g00ecf