diff --git a/.gitignore b/.gitignore index 3efd90e..49b2944 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /poppler-0.59.0.tar.xz /poppler-0.60.0.tar.xz /poppler-0.60.1.tar.xz +/poppler-0.61.0.tar.xz diff --git a/0001-do-not-install-Function.cc-as-it-s-not-a-header.patch b/0001-do-not-install-Function.cc-as-it-s-not-a-header.patch deleted file mode 100644 index fb0c91b..0000000 --- a/0001-do-not-install-Function.cc-as-it-s-not-a-header.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d8aa752574169b6c9e936e4478bee7fa4b781034 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Fri, 6 Oct 2017 08:07:35 +0200 -Subject: [PATCH] do not install Function.cc, as it's not a header - ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7485b2ad..fe5911c3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -572,7 +572,6 @@ if(ENABLE_XPDF_HEADERS) - poppler/FontEncodingTables.h - poppler/FontInfo.h - poppler/Form.h -- poppler/Function.cc - poppler/Function.h - poppler/Gfx.h - poppler/GfxFont.h --- -2.14.1 - diff --git a/0001-use-full-paths-in-.pc-files.patch b/0001-use-full-paths-in-.pc-files.patch new file mode 100644 index 0000000..0c1f70d --- /dev/null +++ b/0001-use-full-paths-in-.pc-files.patch @@ -0,0 +1,111 @@ +From 3078d5a144a0371e51120cfde3289b37b27993f0 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 6 Nov 2017 12:54:12 +0100 +Subject: [PATCH 1/2] use full paths in .pc files + +The current ones don't contain prefix, so they are unusable for +building. +--- + poppler-cairo.pc.cmake | 4 ++-- + poppler-cpp.pc.cmake | 4 ++-- + poppler-glib.pc.cmake | 4 ++-- + poppler-qt4.pc.cmake | 4 ++-- + poppler-qt5.pc.cmake | 4 ++-- + poppler-splash.pc.cmake | 4 ++-- + poppler.pc.cmake | 4 ++-- + 7 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/poppler-cairo.pc.cmake b/poppler-cairo.pc.cmake +index 4a606440..e68cceab 100644 +--- a/poppler-cairo.pc.cmake ++++ b/poppler-cairo.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-cairo + Description: Cairo backend for Poppler PDF rendering library +diff --git a/poppler-cpp.pc.cmake b/poppler-cpp.pc.cmake +index a26177a5..3eb68b38 100644 +--- a/poppler-cpp.pc.cmake ++++ b/poppler-cpp.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-cpp + Description: cpp backend for Poppler PDF rendering library +diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake +index 6e006d49..ac248192 100644 +--- a/poppler-glib.pc.cmake ++++ b/poppler-glib.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-glib + Description: GLib wrapper for poppler +diff --git a/poppler-qt4.pc.cmake b/poppler-qt4.pc.cmake +index 8523a17a..46a37f6d 100644 +--- a/poppler-qt4.pc.cmake ++++ b/poppler-qt4.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-qt4 + Description: Qt4 bindings for poppler +diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake +index aaa1aa77..4f7957c7 100644 +--- a/poppler-qt5.pc.cmake ++++ b/poppler-qt5.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-qt5 + Description: Qt5 bindings for poppler +diff --git a/poppler-splash.pc.cmake b/poppler-splash.pc.cmake +index 1aa1a835..f9eceebe 100644 +--- a/poppler-splash.pc.cmake ++++ b/poppler-splash.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-splash + Description: Splash backend for Poppler PDF rendering library +diff --git a/poppler.pc.cmake b/poppler.pc.cmake +index 9432c5c6..00b73488 100644 +--- a/poppler.pc.cmake ++++ b/poppler.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler + Description: PDF rendering library +-- +2.14.1 + diff --git a/0002-fix-macro.patch b/0002-fix-macro.patch new file mode 100644 index 0000000..85f67be --- /dev/null +++ b/0002-fix-macro.patch @@ -0,0 +1,23 @@ +From 205f6b72f1bba2daea8091c6de2232ed7725993c Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 6 Nov 2017 12:56:52 +0100 +Subject: [PATCH 2/2] fix macro + +--- + poppler-qt5.pc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake +index 4f7957c7..94636892 100644 +--- a/poppler-qt5.pc.cmake ++++ b/poppler-qt5.pc.cmake +@@ -1,5 +1,5 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=CMAKE_INSTALL_FULL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: poppler-qt5 +-- +2.14.1 + diff --git a/poppler.spec b/poppler.spec index 39db192..74271c0 100644 --- a/poppler.spec +++ b/poppler.spec @@ -3,8 +3,8 @@ Summary: PDF rendering library Name: poppler -Version: 0.60.1 -Release: 2%{?dist} +Version: 0.61.0 +Release: 1%{?dist} License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT URL: http://poppler.freedesktop.org/ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz @@ -15,7 +15,8 @@ Source1: %{name}-test-%{test_date}_%{test_sha}.tar.xz Patch0: poppler-0.30.0-rotated-words-selection.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1113172 Patch1: 0001-workaround-a-bug-in-nss-header.patch -Patch2: 0001-do-not-install-Function.cc-as-it-s-not-a-header.patch +Patch2: 0001-use-full-paths-in-.pc-files.patch +Patch3: 0002-fix-macro.patch BuildRequires: cmake BuildRequires: gettext-devel @@ -195,7 +196,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %files %doc README %license COPYING -%{_libdir}/libpoppler.so.71* +%{_libdir}/libpoppler.so.72* %files devel %{_libdir}/pkgconfig/poppler.pc @@ -252,6 +253,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %{_mandir}/man1/* %changelog +* Mon Nov 06 2017 David Tardon - 0.61.0-1 +- new upstream release + * Tue Oct 24 2017 Rex Dieter - 0.60.1-2 - -qt5: drop hard-coded versioned dependency diff --git a/sources b/sources index fdc03f5..feba016 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (poppler-0.60.1.tar.xz) = db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc +SHA512 (poppler-0.61.0.tar.xz) = d65a7ed87c8b87ee9a6b15ace90114c1538af29669a0bd6688895876f1fb726d38ddc4f686efdf5a33fc2a950cab10ca032dcd8f42ef5941b3b089239c6b11f5 SHA512 (poppler-test-2009-05-13_0d2bfd4af4c76a3bac27ccaff793d9129df7b57a.tar.xz) = f8ce114357043a893100de2d52ada8bd850148d19f0e8c889988ea97e9a92313f0545c0b88ef32a1ce7f0e9e58edc1a8c9066278c20b7718ca619913fd4bfb3c