From 75850c4a52ac1202f81b9afaf8af08be21c048c9 Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Jan 12 2011 21:29:25 +0000 Subject: Merge branch 'master' into f14 Upgrade to 0.7.38 --- diff --git a/.gitignore b/.gitignore index fcbeee2..647744d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,16 @@ calibre-0.7.14-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 --git a/calibre-no-update.patch b/calibre-no-update.patch index 7f6cc97..5fe6e02 100644 --- a/calibre-no-update.patch +++ b/calibre-no-update.patch @@ -1,7 +1,19 @@ -diff -Nur calibre.orig/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py ---- calibre.orig/src/calibre/gui2/update.py 2010-06-21 19:38:04.000000000 -0600 -+++ calibre/src/calibre/gui2/update.py 2010-06-21 20:30:50.000000000 -0600 -@@ -39,12 +39,12 @@ +diff -uNr calibre.old/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py +--- calibre.old/src/calibre/gui2/ui.py 2011-01-11 22:08:00.684511166 +0100 ++++ calibre/src/calibre/gui2/ui.py 2011-01-11 22:11:34.522099663 +0100 +@@ -590,7 +590,7 @@ + if write_settings: + self.write_settings() + self.check_messages_timer.stop() +- self.update_checker.terminate() ++ # self.update_checker.terminate() + self.listener.close() + self.job_manager.server.close() + while self.spare_servers: +diff -uNr calibre.old/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py +--- calibre.old/src/calibre/gui2/update.py 2011-01-11 22:08:00.684511166 +0100 ++++ calibre/src/calibre/gui2/update.py 2011-01-11 22:11:16.678301138 +0100 +@@ -87,12 +87,12 @@ class UpdateMixin(object): diff --git a/calibre.spec b/calibre.spec index 509a3f2..3b0b8cd 100644 --- a/calibre.spec +++ b/calibre.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: calibre -Version: 0.7.23 -Release: 2%{?dist} +Version: 0.7.38 +Release: 3%{?dist} Summary: E-book converter and library management Group: Applications/Multimedia License: GPLv3 @@ -18,10 +18,9 @@ URL: http://calibre-ebook.com/ # ./generate-tarball.sh %{version} Source0: %{name}-%{version}-nofonts.tar.xz Source1: generate-tarball.sh -Source2: calibre-mount-helper +Source2: calibre-mount-helper Patch0: %{name}-manpages.patch Patch1: %{name}-no-update.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python >= 2.6 BuildRequires: python-devel >= 2.6 @@ -40,6 +39,8 @@ BuildRequires: xdg-utils BuildRequires: python-BeautifulSoup BuildRequires: chmlib-devel BuildRequires: python-cssutils > 0.9.6 +BuildRequires: sqlite-devel +BuildRequires: libicu-devel Requires: PyQt4 Requires: pyPdf @@ -54,6 +55,10 @@ Requires: python-mechanize Requires: python-dateutil Requires: python-genshi Requires: python-BeautifulSoup +# Require the packages of the files which are symlinked by calibre +Requires: liberation-sans-fonts +Requires: liberation-serif-fonts +Requires: liberation-mono-fonts %description Calibre is meant to be a complete e-library solution. It includes library @@ -87,6 +92,7 @@ RTF, TXT, PDF and LRS. %{__sed} -i -e '/^#!\//, 1d' src/calibre/*/*/*.py %{__sed} -i -e '/^#![ ]*\//, 1d' src/calibre/*/*.py %{__sed} -i -e '/^#!\//, 1d' src/calibre/*.py +%{__sed} -i -e '/^#!\//, 1d' src/templite/*.py %{__sed} -i -e '/^#!\//, 1d' resources/recipes/* %{__sed} -i -e '/^#!\//, 1d' resources/default_tweaks.py @@ -100,8 +106,6 @@ RTF, TXT, PDF and LRS. OVERRIDE_CFLAGS="%{optflags}" python setup.py build %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{_datadir} # create directories for xdg-utils @@ -140,6 +144,7 @@ find %{buildroot}%{_datadir}/mime -maxdepth 1 -type f|xargs rm -f # packages aren't allowed to register mimetypes like this rm -f %{buildroot}%{_datadir}/applications/defaults.list +rm -f %{buildroot}%{_datadir}/applications/mimeinfo.cache desktop-file-validate \ %{buildroot}%{_datadir}/applications/calibre-ebook-viewer.desktop @@ -213,25 +218,22 @@ done; cp -a %{SOURCE2} %{buildroot}%{_bindir}/ -%clean -%{__rm} -rf %{buildroot} - %post update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYRIGHT LICENSE Changelog.yaml @@ -261,7 +263,7 @@ fi %{_libdir}/%{name} %{_datadir}/%{name} %{_datadir}/pixmaps/* -%{_datadir}/applications/* +%{_datadir}/applications/*.desktop %{_datadir}/mime/packages/* %{_datadir}/icons/hicolor/scalable/mimetypes/* %{_datadir}/icons/hicolor/scalable/apps/* @@ -269,9 +271,73 @@ fi %{_mandir}/man1/* %changelog +* Tue Jan 11 2011 Christian Krause - 0.7.38-3 +- Fix crash on exit (BZ 559484, 642877, 651727) + +* Mon Jan 10 2011 Christian Krause - 0.7.38-2 +- Remove obsolete BuildRoot tag and %%clean section +- Require font packages which contain files which are symlinked + by calibre +- Remove unnecessary shebang from internal python files +- Update scriptlets for icon cache +- Don't package mimeinfo.cache, it is auto-generated by + update-mime-database + +* Fri Jan 07 2011 Kevin Fenzi - 0.7.38-1 +- Update to 0.7.38 + +* Mon Jan 03 2011 Rex Dieter - 0.7.36-2 +- rebuild (poppler) + * Sun Jan 02 2011 Rex Dieter - 0.7.23-2 - rebuild (poppler) +* Sat Jan 01 2011 Kevin Fenzi - 0.7.36-1 +- Update to 0.7.36 + +* Thu Dec 23 2010 Kevin Fenzi - 0.7.35-1 +- Update to 0.7.35 + +* Fri Dec 17 2010 Kevin Fenzi - 0.7.34-1 +- Update to 0.7.34 + +* Wed Dec 15 2010 Rex Dieter - 0.7.33-2 +- rebuild (poppler) + +* Fri Dec 10 2010 Kevin Fenzi - 0.7.33-1 +- Update to 0.7.33 + +* Fri Dec 03 2010 Kevin Fenzi - 0.7.32-1 +- Update to 0.7.32 + +* Fri Nov 26 2010 Kevin Fenzi - 0.7.30-1 +- Update to 0.7.30 + +* Fri Nov 19 2010 Kevin Fenzi - 0.7.29-1 +- Update to 0.7.29 + +* Sat Nov 13 2010 Kevin Fenzi - 0.7.28-1 +- Update to 0.7.28 + +* Fri Nov 05 2010 Kevin Fenzi - 0.7.27-1 +- Update to 0.7.27 + +* Tue Nov 02 2010 Dan Horák - 0.7.26-2 +- rebuilt against podofo 0.8.4 + +* Fri Oct 30 2010 Kevin Fenzi - 0.7.26-1 +- Update to 0.7.26 + +* Fri Oct 29 2010 Kevin Fenzi - 0.7.25-1 +- Update to 0.7.25 +- http://calibre-ebook.com/whats-new for full changelog + +* Fri Oct 22 2010 Dan Horák - 0.7.24-2 +- rebuilt against podofo 0.8.3 + +* Tue Oct 19 2010 Kevin Fenzi - 0.7.24-1 +- Update to 0.7.24 + * Sat Oct 09 2010 Kevin Fenzi - 0.7.23-1 - Update to 0.7.23 - Fix up mount helper with our own local script. diff --git a/sources b/sources index 65f2e04..87de5bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d14e146d6daf15e88490d5c8884a25a calibre-0.7.23-nofonts.tar.xz +c5dcfcd098ce85dc1817c3b0d23cfc8d calibre-0.7.38-nofonts.tar.xz