[calibre] Update to 1.48.0

[Kevin Fenzi]

commit d5cc00b603e9172e2c471214cb56e62e6178c31a
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Tue Aug 19 17:04:28 2014 -0600

    Update to 1.48.0

 .gitignore              |    1 +
 calibre-no-update.patch |   18 +++++++++---------
 calibre.spec            |    9 +++++++--
 sources                 |    2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c24c20..b6c9a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,3 +176,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-1.43.0-nofonts.tar.xz
 /calibre-1.45.0-nofonts.tar.xz
 /calibre-1.46.0-nofonts.tar.xz
+/calibre-1.48.0-nofonts.tar.xz
diff --git a/calibre-no-update.patch b/calibre-no-update.patch
index 496ee55..fbfcacc 100644
--- a/calibre-no-update.patch
+++ b/calibre-no-update.patch
@@ -1,7 +1,7 @@
-diff -uNr calibre.old/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
---- calibre.old/src/calibre/gui2/ui.py	2011-12-30 17:12:37.909499254 +0100
-+++ calibre/src/calibre/gui2/ui.py	2011-12-30 17:14:33.899450513 +0100
-@@ -681,7 +681,6 @@
+diff -Nur calibre.orig/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
+--- calibre.orig/src/calibre/gui2/ui.py	2014-08-19 15:21:03.631159912 -0600
++++ calibre/src/calibre/gui2/ui.py	2014-08-19 15:21:47.033416065 -0600
+@@ -883,7 +883,6 @@
          if write_settings:
              self.write_settings()
          self.check_messages_timer.stop()
@@ -9,10 +9,10 @@ diff -uNr calibre.old/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
          self.listener.close()
          self.job_manager.server.close()
          self.job_manager.threaded_server.close()
-diff -uNr calibre.old/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py
---- calibre.old/src/calibre/gui2/update.py	2011-12-30 17:12:37.910499245 +0100
-+++ calibre/src/calibre/gui2/update.py	2011-12-30 17:14:11.307655638 +0100
-@@ -122,11 +122,6 @@
+diff -Nur calibre.orig/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py
+--- calibre.orig/src/calibre/gui2/update.py	2014-08-19 15:21:03.632159894 -0600
++++ calibre/src/calibre/gui2/update.py	2014-08-19 15:22:25.305760137 -0600
+@@ -136,11 +136,6 @@
  
      def __init__(self, opts):
          self.last_newest_calibre_version = NO_CALIBRE_UPDATE
@@ -23,4 +23,4 @@ diff -uNr calibre.old/src/calibre/gui2/update.py calibre/src/calibre/gui2/update
 -            self.update_checker.start()
  
      def recalc_update_label(self, number_of_plugin_updates):
-         self.update_found('%s%s%d'%(self.last_newest_calibre_version, VSEP,
+         self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)
diff --git a/calibre.spec b/calibre.spec
index 40c64dd..f465ee4 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -5,8 +5,8 @@
 %global __provides_exclude_from ^%{_libdir}/%{name}/%{name}/plugins/.*\.so$
 
 Name:           calibre
-Version:        1.46.0
-Release:        4%{?dist}
+Version:        1.48.0
+Release:        1%{?dist}
 Summary:        E-book converter and library manager
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -54,6 +54,8 @@ BuildRequires:  web-assets-devel
 # directory (and then installs in the wrong place)
 BuildRequires:  bash-completion
 BuildRequires:  python-apsw
+# Remove this once bug 1131723 is fixed.
+BuildRequires:  openjpeg2
 #
 # If python-feedparser is installed at build time there's problems with links. 
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1026469
@@ -312,6 +314,9 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/
 %{_datadir}/appdata/calibre*.appdata.xml
 
 %changelog
+* Tue Aug 19 2014 Kevin Fenzi <kevin at scrye.com> 1.48.0-1
+- Update to 1.48.0
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.46.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index ee7a92a..897eb3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6eb9e104bdc778629e3abc45b877ab8  calibre-1.46.0-nofonts.tar.xz
+652337726d4606408b1294cdd7c4e49c  calibre-1.48.0-nofonts.tar.xz