From 4e51fd1784bc8d2bab86c158967ffb93ed5df5bab29f8e24d78fe3df55f37da3 Mon Sep 17 00:00:00 2001 From: Kyrill Detinov Date: Fri, 31 May 2013 17:00:32 +0000 Subject: [PATCH] update to 0.7.17 OBS-URL: https://build.opensuse.org/package/show/Publishing/pdf2djvu?expand=0&rev=26 --- pdf2djvu-poppler.patch | 24 ----------- pdf2djvu.changes | 10 +++++ pdf2djvu.keyring | 82 ++++++++++++++++++++++++++++++++++++++ pdf2djvu.spec | 17 ++++---- pdf2djvu_0.7.15.tar.gz | 3 -- pdf2djvu_0.7.17.tar.gz | 3 ++ pdf2djvu_0.7.17.tar.gz.asc | 17 ++++++++ 7 files changed, 122 insertions(+), 34 deletions(-) delete mode 100644 pdf2djvu-poppler.patch create mode 100644 pdf2djvu.keyring delete mode 100644 pdf2djvu_0.7.15.tar.gz create mode 100644 pdf2djvu_0.7.17.tar.gz create mode 100644 pdf2djvu_0.7.17.tar.gz.asc diff --git a/pdf2djvu-poppler.patch b/pdf2djvu-poppler.patch deleted file mode 100644 index 8947873..0000000 --- a/pdf2djvu-poppler.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: pdf2djvu-0.7.15/pdf-backend.cc -=================================================================== ---- pdf2djvu-0.7.15.orig/pdf-backend.cc -+++ pdf2djvu-0.7.15/pdf-backend.cc -@@ -28,7 +28,7 @@ - #if POPPLER_VERSION < 2100 - #include - #else --#include -+#include - #endif - #include - -@@ -575,7 +575,9 @@ pdf::Object *pdf::dict_lookup(pdf::Dict - void pdf::write_as_utf8(std::ostream &stream, Unicode unicode_char) - { - char buffer[8]; -- int seqlen = mapUTF8(unicode_char, buffer, sizeof buffer); -+ GooString enc("UTF-8"); -+ UnicodeMap *utf8Map = globalParams->getUnicodeMap(&enc); -+ int seqlen = utf8Map->mapUnicode(unicode_char, buffer, sizeof buffer); - stream.write(buffer, seqlen); - } - diff --git a/pdf2djvu.changes b/pdf2djvu.changes index 0a1cdc2..9c25970 100644 --- a/pdf2djvu.changes +++ b/pdf2djvu.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri May 31 09:57:56 UTC 2013 - lazy.kent@opensuse.org + +- Update to 0.7.17. + * Fix build failure with Poppler ≥ 0.23. +- Changes in 0.7.16. + * Fix build failure with Poppler ≥ 0.21.1. +- Drop pdf2djvu-poppler.patch (fixed upstream). +- Verify GPG signature. + ------------------------------------------------------------------- Tue Nov 13 12:44:43 UTC 2012 - idonmez@suse.com diff --git a/pdf2djvu.keyring b/pdf2djvu.keyring new file mode 100644 index 0000000..d7a8dae --- /dev/null +++ b/pdf2djvu.keyring @@ -0,0 +1,82 @@ +pub 4096R/015475F5 2009-10-23 [expires: 2014-01-01] +uid Jakub Wilk +uid Jakub Wilk +uid Jakub Wilk +sub 4096R/E5874F63 2009-10-23 + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +bN5AxyPui0i3KQXs09FW/+n9DTw= +=AA/F +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pdf2djvu.spec b/pdf2djvu.spec index 1fd62d0..f92ee21 100644 --- a/pdf2djvu.spec +++ b/pdf2djvu.spec @@ -1,7 +1,7 @@ # # spec file for package pdf2djvu # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,20 @@ Name: pdf2djvu -Version: 0.7.15 +Version: 0.7.17 Release: 0 Summary: PDF to DjVu Converter License: GPL-2.0 Group: Productivity/Publishing/PDF Url: http://pdf2djvu.googlecode.com/ Source0: http://pdf2djvu.googlecode.com/files/%{name}_%{version}.tar.gz -Patch1: pdf2djvu-poppler.patch +Source1: http://pdf2djvu.googlecode.com/files/%{name}_%{version}.tar.gz.asc +Source2: %{name}.keyring BuildRequires: djvulibre BuildRequires: gcc-c++ +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif BuildRequires: pkgconfig(GraphicsMagick++) BuildRequires: pkgconfig(ddjvuapi) BuildRequires: pkgconfig(libxslt) @@ -44,8 +48,8 @@ metadata. %prep %setup -q -%if 0%{?suse_version} > 1220 -%patch1 -p1 +%if 0%{?gpg_verify:1} +%gpg_verify %{SOURCE1} %endif %build @@ -58,8 +62,7 @@ make %{?_smp_mflags} %files %defattr(-,root,root,-) -%doc COPYING doc/changelog doc/cjk.txt doc/credits.txt -%doc doc/djvudigital.txt +%doc COPYING doc/{changelog,cjk.txt,credits.txt,djvudigital.txt} %{_bindir}/%{name} %doc %{_mandir}/man?/* diff --git a/pdf2djvu_0.7.15.tar.gz b/pdf2djvu_0.7.15.tar.gz deleted file mode 100644 index 9e91fb9..0000000 --- a/pdf2djvu_0.7.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9541833eca904fa4425ad9a940ca837fb3dfc93ca5b6120c5ebf813cb0e4d144 -size 320769 diff --git a/pdf2djvu_0.7.17.tar.gz b/pdf2djvu_0.7.17.tar.gz new file mode 100644 index 0000000..bf2d994 --- /dev/null +++ b/pdf2djvu_0.7.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe6d6e2d6df53195f082890d3cb5e50080784510691e708a5e4614b49662f4da +size 320923 diff --git a/pdf2djvu_0.7.17.tar.gz.asc b/pdf2djvu_0.7.17.tar.gz.asc new file mode 100644 index 0000000..1d09867 --- /dev/null +++ b/pdf2djvu_0.7.17.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iQIcBAABCAAGBQJRp715AAoJEC1Os6YBVHX1Z7UQAKWyBNerOeD+hoU+0+toLR+T +3lXWjRIpJu5jB7ivD8sd07/TOvChUH6xs1vLkS6/jeiONjcttQD+LohfSdWbniV4 +DBMuyjpt8wLGeCrP309MfsE+0REEyyrJ5n+Ys1YQDnZvYWrOUo0jI3ekkM+QlpAX +ayGMjodxxU9AIYSDHmaZN6PWaLouWEyIKm/00RD36ZtKI3avty20jKofibNUQavP +2s2c8n1czYgvf7qU3kD7QYSSfU/2uYQZTqrgntIDy+8Ac+cvtpjlxfqeil+DR5ML +m0YqMMDktuunSJzmUkY8ZVDn+1UxJafRInstS7z2Hdweww38FlFoczO+beivi9MJ +JkJQlLWWb3fNQgkYoiwD8d4GtIX2XszPNIYB20oPdD70sBWlBhlsAFm+SpBbKLsy +zIY2GTLgtoBqu0pEEtwaX1mFFWCIppBSOjcUqJKLQap4h2/HVb1B+upRvR0TzKkk +7huc6N68j35i9lREjLmDUN5YxTWBrkQVzUGa8rgl/qGisRTmcL90ZQYEijEk9GxX +dCvoOaHKJkxzPzbHfWzE8xK3+kzNh27QyZnxot9DB53jkWKrP23eUrnrcrm1GVhY +Nb0/yERzJpZ+q8/ZsomOvpz14NlrFitgePxMR0TFfk9QluJfgXBBexfKgOpfxVgu +UzPGAgG0wfEpqPTHlw9b +=Gd8Z +-----END PGP SIGNATURE-----