Update to 0.9.4

diff --git a/calibre-locales.patch b/calibre-locales.patch
index 654c3eccfc4c337333275476bd5fecb37b03a7d5..580afbc7c8161b3106a0f0c2ac7c4aac12151700 100644 (file)
--- a/calibre-locales.patch
+++ b/calibre-locales.patch
@@ -1,6 +1,6 @@
---- calibre/src/calibre/utils/localization.py~ 2012-01-13 05:32:13.000000000 +0100
-+++ calibre/src/calibre/utils/localization.py  2012-01-17 09:35:01.311333439 +0100
-@@ -49,20 +49,20 @@
+--- calibre/src/calibre/utils/localization.py.old      2012-10-28 22:07:25.481983550 +0100
++++ calibre/src/calibre/utils/localization.py  2012-10-28 22:12:17.250402847 +0100
+@@ -73,20 +73,20 @@ def get_lang():
          lang = 'en'
      return lang
  
@@ -13,7 +13,7 @@
 -        if lang in available_translations():
 -            hlang = lang
 -        else:
--            xlang = lang.split('_')[0]
+-            xlang = lang.split('_')[0].lower()
 -            if xlang in available_translations():
 -                hlang = xlang
 -    return hlang
@@ -33,7 +33,7 @@
  
  def set_translators():
      # To test different translations invoke as
-@@ -84,18 +84,12 @@
+@@ -110,18 +110,12 @@ def set_translators():
                  buf = cStringIO.StringIO(buf.getvalue())
  
          if mpath is not None:
@@ -56,8 +56,8 @@
 +            if os.path.exists(isof):
 +                iso639 = open(isof, 'rb')
  
-         t = None
          if buf is not None:
+             t = GNUTranslations(buf)
 --- calibre/src/calibre/translations/dynamic.py.orig    2012-01-13 05:32:13.000000000 +0100
 +++ calibre/src/calibre/translations/dynamic.py 2012-01-17 09:37:53.594649557 +0100
 @@ -5,10 +5,10 @@

diff --git a/calibre.spec b/calibre.spec
index f144dfc0bd2d47a52f4ea8425621be445a157795..ce758852c9533b80f38375a0fc3319e8d3cd56d0 100644 (file)
--- a/calibre.spec
+++ b/calibre.spec
@@ -12,8 +12,8 @@
 Summary:       E-book converter and library management
 Summary(pl.UTF-8):     Konwerter oraz biblioteka dla e-booków
 Name:          calibre
-Version:       0.8.58
-Release:       2
+Version:       0.9.4
+Release:       1
 License:       GPL v3+
 Group:         Applications/Multimedia
 Source0:       %{name}-%{version}-nofonts.tar.xz
@@ -27,12 +27,16 @@ Patch3:             %{name}-locales.patch
 Patch4:                shebang-python-fix.patch
 URL:           http://www.calibre-ebook.com/
 BuildRequires: ImageMagick-devel >= 6.6.4.7
-BuildRequires: chmlib-devel
+BuildRequires: QtGui-devel
+BuildRequires: QtSvg-devel
+BuildRequires: chmlib-devel >= 0.40
 BuildRequires: libicu-devel
+BuildRequires: libmtp-devel >= 1.1.5
+BuildRequires: libwmf-devel >= 0.2.8
 BuildRequires: pkgconfig
-BuildRequires: podofo-devel
-BuildRequires: poppler-Qt-devel
-BuildRequires: poppler-glib-devel
+BuildRequires: podofo-devel >= 0.8.2
+BuildRequires: poppler-Qt-devel >= 0.20.2
+BuildRequires: poppler-glib-devel >= 0.20.2
 BuildRequires: python-BeautifulSoup
 BuildRequires: python-PIL
 BuildRequires: python-PyQt4-devel
@@ -52,14 +56,19 @@ BuildRequires:      tar >= 1:1.22
 BuildRequires: unzip
 BuildRequires: xdg-utils
 BuildRequires: xz >= 1:4.999.7
-Requires:      python-BeautifulSoup
-Requires:      python-PIL
-Requires:      python-PyQt4
+Requires:      python-BeautifulSoup >= 3.0.5
+Requires:      python-PIL >= 1.1.6
+Requires:      python-PyQt4 >= 4.9.1
+Requires:      python-cssselect >= 0.7.1
 Requires:      python-cssutils >= 1:0.9.9
-Requires:      python-dateutil
-Requires:      python-lxml
-Requires:      python-mechanize
+Requires:      python-dateutil >= 1.4.1
+Requires:      python-dns >= 1.6.0
+Requires:      python-genshi
+Requires:      python-lxml >= 2.2.1
+Requires:      python-mechanize >= 0.1.11
 Requires:      python-modules-sqlite
+Requires:      python-netifaces >= 0.8
+Requires:      python-psutil >= 0.6.1
 Suggests:      ImageMagick-coder-jpeg
 Suggests:      ImageMagick-coder-png
 ### FIXME: libunrar.so is needed for rar-packed files
@@ -147,8 +156,6 @@ LIBPATH="%{_libdir}" \
 cp -p resources/images/library.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}-gui.png
 cp -p resources/images/viewer.png $RPM_BUILD_ROOT%{_pixmapsdir}/calibre-viewer.png
 
-mv $RPM_BUILD_ROOT%{_datadir}/mime/packages/calibre-mimetypes{,.xml}
-
 %py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name}
 %py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
 %py_postclean %{_libdir}/%{name}
@@ -176,6 +183,8 @@ done;
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/%{name}-uninstall
 
 # unsupported
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ber
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/jv
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ltg
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/en_AU
 
@@ -220,19 +229,13 @@ fi
 %attr(755,root,root) %{_bindir}/lrfviewer
 %attr(755,root,root) %{_bindir}/lrs2lrf
 %attr(755,root,root) %{_bindir}/markdown-calibre
-%attr(755,root,root) %{_bindir}/pdfmanipulate
 %attr(755,root,root) %{_bindir}/web2disk
 %{_datadir}/%{name}
 %{_libdir}/%{name}
 %{_desktopdir}/calibre-ebook-viewer.desktop
 %{_desktopdir}/calibre-gui.desktop
 %{_desktopdir}/calibre-lrfviewer.desktop
-%{_iconsdir}/hicolor/128x128/apps/calibre-gui.png
-%{_iconsdir}/hicolor/128x128/apps/calibre-viewer.png
-%{_iconsdir}/hicolor/128x128/mimetypes/application-lrf.png
-%{_iconsdir}/hicolor/128x128/mimetypes/gnome-mime-application-lrf.png
-%{_iconsdir}/hicolor/128x128/mimetypes/gnome-mime-text-lrs.png
-%{_iconsdir}/hicolor/128x128/mimetypes/text-lrs.png
+%{_iconsdir}/hicolor/*/*/*.png
 %{_datadir}/mime/packages/calibre-mimetypes.xml
 %{_pixmapsdir}/%{name}-gui.png
 %{_pixmapsdir}/calibre-viewer.png