diff --git a/.gitignore b/.gitignore index 2829bc9..599a2e8 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ calibre-0.7.14-nofonts.tar.xz /calibre-0.8.18-nofonts.tar.xz /calibre-0.8.19-nofonts.tar.xz /calibre-0.8.20-nofonts.tar.xz +/calibre-0.8.21-nofonts.tar.xz diff --git a/calibre-0.7.38-pyPdf-fix.patch b/calibre-0.7.38-pyPdf-fix.patch deleted file mode 100644 index 3600554..0000000 --- a/calibre-0.7.38-pyPdf-fix.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -uNr calibre.old/src/calibre/ebooks/pdf/manipulate/crop.py calibre/src/calibre/ebooks/pdf/manipulate/crop.py ---- calibre.old/src/calibre/ebooks/pdf/manipulate/crop.py 2011-03-21 00:04:16.946217391 +0100 -+++ calibre/src/calibre/ebooks/pdf/manipulate/crop.py 2011-03-21 00:08:54.324717632 +0100 -@@ -102,7 +102,7 @@ - if len(bounding_lines) != input_pdf.numPages: - raise Exception('Error bounding file %s page count does not correspond to specified pdf' % opts.bounding) - -- output_pdf = PdfFileWriter(title=title,author=author) -+ output_pdf = PdfFileWriter() - blines = iter(bounding_lines) - for page in input_pdf.pages: - if bounding_lines != []: -diff -uNr calibre.old/src/calibre/ebooks/pdf/manipulate/decrypt.py calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py ---- calibre.old/src/calibre/ebooks/pdf/manipulate/decrypt.py 2011-03-21 00:04:16.947217310 +0100 -+++ calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py 2011-03-21 00:08:23.849195389 +0100 -@@ -72,7 +72,7 @@ - - title = pdf.documentInfo.title if pdf.documentInfo.title else _('Unknown') - author = pdf.documentInfo.author if pdf.documentInfo.author else _('Unknown') -- out_pdf = PdfFileWriter(title=title, author=author) -+ out_pdf = PdfFileWriter() - - for page in pdf.pages: - out_pdf.addPage(page) -diff -uNr calibre.old/src/calibre/ebooks/pdf/manipulate/encrypt.py calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py ---- calibre.old/src/calibre/ebooks/pdf/manipulate/encrypt.py 2011-03-21 00:04:16.948217229 +0100 -+++ calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py 2011-03-21 00:09:05.909775518 +0100 -@@ -66,7 +66,7 @@ - title = metadata.title - author = authors_to_string(metadata.authors) - -- out_pdf = PdfFileWriter(title=title, author=author) -+ out_pdf = PdfFileWriter() - - pdf = PdfFileReader(open(os.path.abspath(pdf_path), 'rb')) - for page in pdf.pages: -diff -uNr calibre.old/src/calibre/ebooks/pdf/manipulate/merge.py calibre/src/calibre/ebooks/pdf/manipulate/merge.py ---- calibre.old/src/calibre/ebooks/pdf/manipulate/merge.py 2011-03-21 00:04:16.949217148 +0100 -+++ calibre/src/calibre/ebooks/pdf/manipulate/merge.py 2011-03-21 00:08:32.281510009 +0100 -@@ -68,7 +68,7 @@ - title = metadata.title - author = authors_to_string(metadata.authors) - -- out_pdf = PdfFileWriter(title=title, author=author) -+ out_pdf = PdfFileWriter() - - for pdf_path in in_paths: - pdf = PdfFileReader(open(os.path.abspath(pdf_path), 'rb')) -diff -uNr calibre.old/src/calibre/ebooks/pdf/manipulate/reverse.py calibre/src/calibre/ebooks/pdf/manipulate/reverse.py ---- calibre.old/src/calibre/ebooks/pdf/manipulate/reverse.py 2011-03-21 00:04:16.949217148 +0100 -+++ calibre/src/calibre/ebooks/pdf/manipulate/reverse.py 2011-03-21 00:08:06.841577565 +0100 -@@ -66,7 +66,7 @@ - title = metadata.title - author = authors_to_string(metadata.authors) - -- out_pdf = PdfFileWriter(title=title, author=author) -+ out_pdf = PdfFileWriter() - - pdf = PdfFileReader(open(os.path.abspath(pdf_path), 'rb')) - for page in reversed(pdf.pages): -diff -uNr calibre.old/src/calibre/ebooks/pdf/manipulate/rotate.py calibre/src/calibre/ebooks/pdf/manipulate/rotate.py ---- calibre.old/src/calibre/ebooks/pdf/manipulate/rotate.py 2011-03-21 00:04:16.950217067 +0100 -+++ calibre/src/calibre/ebooks/pdf/manipulate/rotate.py 2011-03-21 00:08:15.289891163 +0100 -@@ -65,7 +65,7 @@ - title = metadata.title - author = authors_to_string(metadata.authors) - -- out_pdf = PdfFileWriter(title=title, author=author) -+ out_pdf = PdfFileWriter() - - pdf = PdfFileReader(open(os.path.abspath(pdf_path), 'rb')) - for page in pdf.pages: -diff -uNr calibre.old/src/calibre/ebooks/pdf/manipulate/split.py calibre/src/calibre/ebooks/pdf/manipulate/split.py ---- calibre.old/src/calibre/ebooks/pdf/manipulate/split.py 2011-03-21 00:04:16.951216986 +0100 -+++ calibre/src/calibre/ebooks/pdf/manipulate/split.py 2011-03-21 00:08:42.917645418 +0100 -@@ -84,7 +84,7 @@ - title = metadata.title - author = authors_to_string(metadata.authors) - -- out_pdf = PdfFileWriter(title=title, author=author) -+ out_pdf = PdfFileWriter() - for page_num in range(start, end + 1): - out_pdf.addPage(pdf.getPage(page_num)) - with open('%s%s.pdf' % (name, suffix), 'wb') as out_file: -diff -uNr calibre.old/src/calibre/ebooks/pdf/writer.py calibre/src/calibre/ebooks/pdf/writer.py ---- calibre.old/src/calibre/ebooks/pdf/writer.py 2011-03-21 00:04:17.228194487 +0100 -+++ calibre/src/calibre/ebooks/pdf/writer.py 2011-03-21 00:07:52.059778357 +0100 -@@ -193,7 +193,7 @@ - self.insert_cover() - - try: -- outPDF = PdfFileWriter(title=self.metadata.title, author=self.metadata.author) -+ outPDF = PdfFileWriter() - for item in self.combine_queue: - inputPDF = PdfFileReader(open(item, 'rb')) - for page in inputPDF.pages: diff --git a/calibre-0.8.10-poppler.patch b/calibre-0.8.10-poppler.patch deleted file mode 100644 index 6858a98..0000000 --- a/calibre-0.8.10-poppler.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur calibre.orig/src/calibre/ebooks/pdf/reflow.cpp calibre/src/calibre/ebooks/pdf/reflow.cpp ---- calibre.orig/src/calibre/ebooks/pdf/reflow.cpp 2011-07-15 10:54:35.000000000 -0600 -+++ calibre/src/calibre/ebooks/pdf/reflow.cpp 2011-07-16 10:01:28.576025342 -0600 -@@ -625,7 +625,7 @@ - return oss.str(); - } - --void XMLOutputDev::process_link(Link* link){ -+void XMLOutputDev::process_link(AnnotLink* link){ - double _x1, _y1, _x2, _y2; - int x1, y1, x2, y2; - -diff -Nur calibre.orig/src/calibre/ebooks/pdf/reflow.h calibre/src/calibre/ebooks/pdf/reflow.h ---- calibre.orig/src/calibre/ebooks/pdf/reflow.h 2011-07-15 10:54:35.000000000 -0600 -+++ calibre/src/calibre/ebooks/pdf/reflow.h 2011-07-16 10:00:49.766268969 -0600 -@@ -244,6 +244,6 @@ - XMLImages *images; - PDFDoc *doc; - -- void process_link(Link* link); -+ void process_link(AnnotLink* link); - }; - } diff --git a/calibre-0.8.18-poppler-0.17.3.patch b/calibre-0.8.18-poppler-0.17.3.patch deleted file mode 100644 index bdf9070..0000000 --- a/calibre-0.8.18-poppler-0.17.3.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- calibre/src/calibre/ebooks/pdf/images.cpp 2011-07-22 18:17:44.000000000 +0200 -+++ calibre/src/calibre/ebooks/pdf/images.cpp 2011-09-09 13:30:26.000000000 +0200 -@@ -126,7 +126,13 @@ void XMLImages::add(GfxState *state, Obj - - if (img->type == jpeg) { - int c; -+ -+#if POPPLER_CHECK_VERSION(0, 17, 3) -+ str = str->getBaseStream(); -+#else - str = ((DCTStream *)str)->getRawStream(); -+#endif -+ - str->reset(); - - // copy the stream ---- calibre/src/calibre/ebooks/pdf/images.h 2011-09-09 13:35:14.000000000 +0200 -+++ calibre/src/calibre/ebooks/pdf/images.h 2011-09-09 13:35:27.000000000 +0200 -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include "utils.h" - - using namespace std; diff --git a/calibre-0.8.21-poppler.patch b/calibre-0.8.21-poppler.patch new file mode 100644 index 0000000..04af69a --- /dev/null +++ b/calibre-0.8.21-poppler.patch @@ -0,0 +1,22 @@ +diff -Nur calibre.orig/src/calibre/ebooks/pdf/reflow.cpp calibre/src/calibre/ebooks/pdf/reflow.cpp +--- calibre.orig/src/calibre/ebooks/pdf/reflow.cpp 2011-09-30 11:28:44.000000000 -0600 ++++ calibre/src/calibre/ebooks/pdf/reflow.cpp 2011-10-09 18:57:36.433731713 -0600 +@@ -12,6 +12,7 @@ + #include + #include "reflow.h" + #include "utils.h" ++#include + + using namespace std; + using namespace calibre_reflow; +diff -Nur calibre.orig/src/calibre/ebooks/pdf/reflow.h calibre/src/calibre/ebooks/pdf/reflow.h +--- calibre.orig/src/calibre/ebooks/pdf/reflow.h 2011-09-30 11:28:44.000000000 -0600 ++++ calibre/src/calibre/ebooks/pdf/reflow.h 2011-10-09 18:57:04.338582882 -0600 +@@ -36,6 +36,7 @@ + #include "fonts.h" + #include "links.h" + #include "images.h" ++#include + + using namespace std; + diff --git a/calibre.spec b/calibre.spec index e1a4c5e..b798582 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.8.20 -Release: 2%{?dist} +Version: 0.8.21 +Release: 1%{?dist} Summary: E-book converter and library management Group: Applications/Multimedia License: GPLv3 @@ -21,8 +21,7 @@ Source1: generate-tarball.sh Source2: calibre-mount-helper Patch0: %{name}-manpages.patch Patch1: %{name}-no-update.patch -Patch3: calibre-0.8.10-poppler.patch -Patch4: calibre-0.8.18-poppler-0.17.3.patch +Patch2: calibre-0.8.21-poppler.patch BuildRequires: python >= 2.6 BuildRequires: python-devel >= 2.6 @@ -90,11 +89,8 @@ RTF, TXT, PDF and LRS. # don't check for new upstream version (that's what packagers do) %patch1 -p1 -b .no-update -# work with poppler 0.17 -%patch3 -p1 -b .poppler-fix - -# fix for poppler 0.17.3 -%patch4 -p1 -b .poppler-0.17.3 +# modify poppler checks +%patch2 -p1 -b .poppler # dos2unix newline conversion %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/* @@ -258,6 +254,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man1/* %changelog +* Sat Oct 09 2011 Kevin Fenzi - 0.8.21-1 +- Update to 0.8.21 + * Fri Sep 30 2011 Marek Kasik - 0.8.20-2 - Rebuild (poppler-0.18.0) diff --git a/sources b/sources index 5658477..cc14547 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f988e850bf146caf6a6382bd6bd7eb42 calibre-0.8.20-nofonts.tar.xz +a2de1cd0708deeaeea83f7dabd3636bf calibre-0.8.21-nofonts.tar.xz