Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2018-01-09 14:47:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler" Tue Jan 9 14:47:59 2018 rev:145 rq:557962 version:0.62.0 Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt5.changes 2017-11-30 12:34:54.560786031 +0100 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt5.changes 2018-01-09 14:48:00.774374645 +0100 @@ -1,0 +2,28 @@ +Sun Dec 10 00:14:42 UTC 2017 - [email protected] + +- Update to version 0.62.0: + + Core: + - Stop supporting lcms1 and openjpeg1. + - Open files that state 8 bits as third field of W + (fdo#103469). + - GfxLabColorSpace::parse: fix crash in broken documents + (fdo#103582). + - Fixes: leak if parseDA fails. And UTF test fail. + - Include glibc.h where needed. + - Document the meaning of the 'type' integer of a shading. + - INSTALL: add debug options. + + Qt5: add API to let the rendering process callback to get a + partial rendering (fdo#103372). + + Qt4: remove the Qt4 frontend. + + Utils: + - Support unicode on windows console. + - pdfsig: install man page. + - sort encoding list. + + Glib: demo: fix warning. +- Remove Qt4 poppler package following upstream change. +- Drop conditional use of openjpeg-devel BuildRequires and mainly + use pkgconfig(libopenjp2) instead, following upstream change. +- Drop Provides/Obsoletes meant for pristine openSUSE 10.3, + 11.1/(SLE 11) and 11.4 releases. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/poppler/poppler.changes 2017-11-30 12:34:54.596784722 +0100 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler.changes 2018-01-09 14:48:00.826372207 +0100 @@ -1,0 +2,33 @@ +Sat Dec 16 17:50:23 UTC 2017 - [email protected] + +- make introspection scanner (g-ir-scanner) work with older build envs + +------------------------------------------------------------------- +Sun Dec 10 00:14:42 UTC 2017 - [email protected] + +- Update to version 0.62.0: + + Core: + - Stop supporting lcms1 and openjpeg1. + - Open files that state 8 bits as third field of W + (fdo#103469). + - GfxLabColorSpace::parse: fix crash in broken documents + (fdo#103582). + - Fixes: leak if parseDA fails. And UTF test fail. + - Include glibc.h where needed. + - Document the meaning of the 'type' integer of a shading. + - INSTALL: add debug options. + + Qt5: add API to let the rendering process callback to get a + partial rendering (fdo#103372). + + Qt4: remove the Qt4 frontend. + + Utils: + - Support unicode on windows console. + - pdfsig: install man page. + - sort encoding list. + + Glib: demo: fix warning. +- Remove Qt4 poppler package following upstream change. +- Drop conditional use of openjpeg-devel BuildRequires and mainly + use pkgconfig(libopenjp2) instead, following upstream change. +- Drop Provides/Obsoletes meant for pristine openSUSE 10.3, + 11.1/(SLE 11) and 11.4 releases. + +------------------------------------------------------------------- Old: ---- poppler-0.61.1.tar.xz poppler-qt.changes poppler-qt.spec New: ---- poppler-0.62.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt5.spec ++++++ --- /var/tmp/diff_new_pack.MApGNH/_old 2018-01-09 14:48:01.798326633 +0100 +++ /var/tmp/diff_new_pack.MApGNH/_new 2018-01-09 14:48:01.802326446 +0100 @@ -16,19 +16,17 @@ # -%define build_qt 0 %define build_qt5 1 Name: poppler-qt5 %define _name poppler -Version: 0.61.1 +Version: 0.62.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.8 -%define poppler_sover 72 +%define poppler_sover 73 %define poppler_cpp_sover 0 %define poppler_glib_sover 8 -%define poppler_qt4_sover 4 %define poppler_qt5_sover 1 %define poppler_api 0.18 %define poppler_apipkg 0_18 @@ -42,11 +40,9 @@ BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel +BuildRequires: gtk-doc BuildRequires: libjpeg-devel BuildRequires: libtiff-devel -%if %build_qt -BuildRequires: libqt4-devel >= 4.7.0 -%endif %if %build_qt5 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) @@ -54,11 +50,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) %endif -%if 0%{?suse_version} > 1310 -BuildRequires: pkgconfig(libopenjp2) -%else -BuildRequires: openjpeg-devel -%endif BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(cairo) >= 1.10.0 @@ -71,6 +62,7 @@ BuildRequires: pkgconfig(gobject-2.0) >= 2.41 BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(nss) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,9 +75,6 @@ Summary: PDF Rendering Library Group: System/Libraries Recommends: poppler-data >= %{poppler_data_version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler = %{version} -Obsoletes: poppler < %{version} %description -n libpoppler%{poppler_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -103,9 +92,6 @@ Summary: Glib wrapper for the poppler PDF rendering library Group: System/Libraries Requires: libpoppler%{poppler_sover} >= %{version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler-glib = %{version} -Obsoletes: poppler-glib < %{version} %description -n libpoppler-glib%{poppler_glib_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -121,18 +107,6 @@ This package provides the GObject Introspection bindings for Poppler. -%package -n libpoppler-qt4-%{poppler_qt4_sover} -Summary: Qt4 wrapper for the Poppler PDF rendering library -Group: System/Libraries -Requires: libpoppler%{poppler_sover} >= %{version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler-qt4 = %{version} -Obsoletes: poppler-qt4 < %{version} - -%description -n libpoppler-qt4-%{poppler_qt4_sover} -Poppler is a PDF rendering library, forked from the xpdf PDF viewer -developed by Derek Noonburg of Glyph and Cog, LLC. - %package -n libpoppler-qt5-%{poppler_qt5_sover} Summary: Qt5 wrapper for the Poppler PDF rendering library Group: System/Libraries @@ -146,10 +120,6 @@ Summary: PDF Rendering Library Tools Group: Productivity/Publishing/PDF Requires: libpoppler%{poppler_sover} >= %{version} -# last version in openSUSE 11.1/SLE11 -Provides: xpdf-tools = 3.02 -Obsoletes: xpdf-tools < 3.02 -Provides: pdftools_any %description tools Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -161,9 +131,6 @@ Requires: libpoppler%{poppler_sover} = %{version} Requires: libpoppler-cpp%{poppler_cpp_sover} = %{version} Requires: libstdc++-devel -# Last appeared in OpenSUSE 10.3: -Provides: poppler-devel = %{version} -Obsoletes: poppler-devel < %{version} %description -n libpoppler-devel Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -174,32 +141,11 @@ Group: Development/Libraries/C and C++ Requires: libpoppler-glib%{poppler_glib_sover} = %{version} Requires: typelib-1_0-Poppler-%{poppler_apipkg} = %{version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler-devel:%{_libdir}/libpoppler-glib.so -# Last appeared in 11.4 -Provides: libpoppler-doc = %{version} -Obsoletes: libpoppler-doc < %{version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler-doc = %{version} -Obsoletes: poppler-doc < %{version} %description -n libpoppler-glib-devel Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler-qt4-devel -Summary: Development files for the Poppler Qt4 wrapper library -Group: Development/Libraries/C and C++ -Requires: libpoppler-devel = %{version} -Requires: libpoppler-qt4-%{poppler_qt4_sover} = %{version} -Requires: libqt4-devel -# Last appeared in OpenSUSE 10.3: -Provides: poppler-devel:%{_libdir}/libpoppler-qt4.so - -%description -n libpoppler-qt4-devel -Poppler is a PDF rendering library, forked from the xpdf PDF viewer -developed by Derek Noonburg of Glyph and Cog, LLC. - %package -n libpoppler-qt5-devel Summary: Development files for the Poppler Qt5 wrapper library Group: Development/Libraries/C and C++ @@ -222,36 +168,28 @@ export MOCQT5='%{_libqt5_bindir}/moc' export MOCQT52='%{_libqt5_bindir}/moc' %endif +# This causes the build to fail + #DENABLE_GTK_DOC=ON \ %cmake\ -DENABLE_XPDF_HEADERS=ON \ -DENABLE_ZLIB=ON \ -DENABLE_LIBCURL=ON \ + -DBUILD_GTK_TESTS=OFF \ %if %build_qt5 -DENABLE_QT5=ON \ - -DENABLE_QT4=OFF \ -DENABLE_GLIB=OFF \ -DENABLE_CPP=OFF \ %endif -%if %build_qt - -DENABLE_QT4=ON \ - -DENABLE_QT5=OFF \ - -DENABLE_GLIB=OFF \ - -DENABLE_CPP=OFF \ -%endif - -DBUILD_GTK_TESTS=OFF \ %{nil} %make_jobs %install %cmake_install -%if %build_qt || %build_qt5 +%if %build_qt5 cd %{buildroot} && find . -type f -o -type l | grep -v qt | xargs rm -v %endif echo > %SOURCE99 -%if %build_qt -echo "libpoppler-qt4-%{poppler_qt4_sover}" >> %SOURCE99 -%else %if %build_qt5 echo "libpoppler-qt5-%{poppler_qt5_sover}" >> %SOURCE99 %else @@ -259,14 +197,11 @@ echo "libpoppler-glib%{poppler_glib_sover}" >> %SOURCE99 echo "libpoppler-cpp%{poppler_cpp_sover}" >> %SOURCE99 %endif -%endif %post -n libpoppler%{poppler_sover} -p /sbin/ldconfig %post -n libpoppler-glib%{poppler_glib_sover} -p /sbin/ldconfig -%post -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig - %post -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig %postun -n libpoppler%{poppler_sover} -p /sbin/ldconfig @@ -277,24 +212,8 @@ %postun -n libpoppler-cpp%{poppler_cpp_sover} -p /sbin/ldconfig -%postun -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig - %postun -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig -%if %build_qt - -%files -n libpoppler-qt4-%{poppler_qt4_sover} -%defattr (-, root, root) -%{_libdir}/libpoppler-qt4.so.%{poppler_qt4_sover}* - -%files -n libpoppler-qt4-devel -%defattr (-, root, root) -%dir %{_includedir}/poppler -%{_includedir}/poppler/qt4 -%{_libdir}/libpoppler-qt4.so -%{_libdir}/pkgconfig/poppler-qt4.pc - -%else %if %build_qt5 %files -n libpoppler-qt5-%{poppler_qt5_sover} @@ -350,9 +269,11 @@ %{_libdir}/libpoppler-glib.so %{_libdir}/pkgconfig/poppler-glib.pc %{_datadir}/gir-1.0/Poppler-%{poppler_api}.gir -#doc %%{_datadir}/gtk-doc/html/poppler/ +# Own these directories to not depend on gtk-doc while building: +#dir %%{_datadir}/gtk-doc/html +#dir %%{_datadir}/gtk-doc/html/poppler +#doc %%{_datadir}/gtk-doc/html/poppler %endif -%endif %changelog ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.MApGNH/_old 2018-01-09 14:48:01.834324945 +0100 +++ /var/tmp/diff_new_pack.MApGNH/_new 2018-01-09 14:48:01.838324758 +0100 @@ -16,19 +16,17 @@ # -%define build_qt 0 %define build_qt5 0 Name: poppler %define _name poppler -Version: 0.61.1 +Version: 0.62.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.8 -%define poppler_sover 72 +%define poppler_sover 73 %define poppler_cpp_sover 0 %define poppler_glib_sover 8 -%define poppler_qt4_sover 4 %define poppler_qt5_sover 1 %define poppler_api 0.18 %define poppler_apipkg 0_18 @@ -42,11 +40,9 @@ BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel +BuildRequires: gtk-doc BuildRequires: libjpeg-devel BuildRequires: libtiff-devel -%if %build_qt -BuildRequires: libqt4-devel >= 4.7.0 -%endif %if %build_qt5 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) @@ -54,11 +50,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) %endif -%if 0%{?suse_version} > 1310 -BuildRequires: pkgconfig(libopenjp2) -%else -BuildRequires: openjpeg-devel -%endif BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(cairo) >= 1.10.0 @@ -71,6 +62,7 @@ BuildRequires: pkgconfig(gobject-2.0) >= 2.41 BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(nss) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,9 +75,6 @@ Summary: PDF Rendering Library Group: System/Libraries Recommends: poppler-data >= %{poppler_data_version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler = %{version} -Obsoletes: poppler < %{version} %description -n libpoppler%{poppler_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -103,9 +92,6 @@ Summary: Glib wrapper for the poppler PDF rendering library Group: System/Libraries Requires: libpoppler%{poppler_sover} >= %{version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler-glib = %{version} -Obsoletes: poppler-glib < %{version} %description -n libpoppler-glib%{poppler_glib_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -121,18 +107,6 @@ This package provides the GObject Introspection bindings for Poppler. -%package -n libpoppler-qt4-%{poppler_qt4_sover} -Summary: Qt4 wrapper for the Poppler PDF rendering library -Group: System/Libraries -Requires: libpoppler%{poppler_sover} >= %{version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler-qt4 = %{version} -Obsoletes: poppler-qt4 < %{version} - -%description -n libpoppler-qt4-%{poppler_qt4_sover} -Poppler is a PDF rendering library, forked from the xpdf PDF viewer -developed by Derek Noonburg of Glyph and Cog, LLC. - %package -n libpoppler-qt5-%{poppler_qt5_sover} Summary: Qt5 wrapper for the Poppler PDF rendering library Group: System/Libraries @@ -146,10 +120,6 @@ Summary: PDF Rendering Library Tools Group: Productivity/Publishing/PDF Requires: libpoppler%{poppler_sover} >= %{version} -# last version in openSUSE 11.1/SLE11 -Provides: xpdf-tools = 3.02 -Obsoletes: xpdf-tools < 3.02 -Provides: pdftools_any %description tools Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -161,9 +131,6 @@ Requires: libpoppler%{poppler_sover} = %{version} Requires: libpoppler-cpp%{poppler_cpp_sover} = %{version} Requires: libstdc++-devel -# Last appeared in OpenSUSE 10.3: -Provides: poppler-devel = %{version} -Obsoletes: poppler-devel < %{version} %description -n libpoppler-devel Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -174,32 +141,11 @@ Group: Development/Libraries/C and C++ Requires: libpoppler-glib%{poppler_glib_sover} = %{version} Requires: typelib-1_0-Poppler-%{poppler_apipkg} = %{version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler-devel:%{_libdir}/libpoppler-glib.so -# Last appeared in 11.4 -Provides: libpoppler-doc = %{version} -Obsoletes: libpoppler-doc < %{version} -# Last appeared in OpenSUSE 10.3: -Provides: poppler-doc = %{version} -Obsoletes: poppler-doc < %{version} %description -n libpoppler-glib-devel Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler-qt4-devel -Summary: Development files for the Poppler Qt4 wrapper library -Group: Development/Libraries/C and C++ -Requires: libpoppler-devel = %{version} -Requires: libpoppler-qt4-%{poppler_qt4_sover} = %{version} -Requires: libqt4-devel -# Last appeared in OpenSUSE 10.3: -Provides: poppler-devel:%{_libdir}/libpoppler-qt4.so - -%description -n libpoppler-qt4-devel -Poppler is a PDF rendering library, forked from the xpdf PDF viewer -developed by Derek Noonburg of Glyph and Cog, LLC. - %package -n libpoppler-qt5-devel Summary: Development files for the Poppler Qt5 wrapper library Group: Development/Libraries/C and C++ @@ -222,36 +168,30 @@ export MOCQT5='%{_libqt5_bindir}/moc' export MOCQT52='%{_libqt5_bindir}/moc' %endif +# make introspection scanner (g-ir-scanner) work with older build envs +export LD_LIBRARY_PATH=$(pwd)/build +# This causes the build to fail + #DENABLE_GTK_DOC=ON \ %cmake\ -DENABLE_XPDF_HEADERS=ON \ -DENABLE_ZLIB=ON \ -DENABLE_LIBCURL=ON \ + -DBUILD_GTK_TESTS=OFF \ %if %build_qt5 -DENABLE_QT5=ON \ - -DENABLE_QT4=OFF \ -DENABLE_GLIB=OFF \ -DENABLE_CPP=OFF \ %endif -%if %build_qt - -DENABLE_QT4=ON \ - -DENABLE_QT5=OFF \ - -DENABLE_GLIB=OFF \ - -DENABLE_CPP=OFF \ -%endif - -DBUILD_GTK_TESTS=OFF \ %{nil} %make_jobs %install %cmake_install -%if %build_qt || %build_qt5 +%if %build_qt5 cd %{buildroot} && find . -type f -o -type l | grep -v qt | xargs rm -v %endif echo > %SOURCE99 -%if %build_qt -echo "libpoppler-qt4-%{poppler_qt4_sover}" >> %SOURCE99 -%else %if %build_qt5 echo "libpoppler-qt5-%{poppler_qt5_sover}" >> %SOURCE99 %else @@ -259,14 +199,11 @@ echo "libpoppler-glib%{poppler_glib_sover}" >> %SOURCE99 echo "libpoppler-cpp%{poppler_cpp_sover}" >> %SOURCE99 %endif -%endif %post -n libpoppler%{poppler_sover} -p /sbin/ldconfig %post -n libpoppler-glib%{poppler_glib_sover} -p /sbin/ldconfig -%post -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig - %post -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig %postun -n libpoppler%{poppler_sover} -p /sbin/ldconfig @@ -277,24 +214,8 @@ %postun -n libpoppler-cpp%{poppler_cpp_sover} -p /sbin/ldconfig -%postun -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig - %postun -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig -%if %build_qt - -%files -n libpoppler-qt4-%{poppler_qt4_sover} -%defattr (-, root, root) -%{_libdir}/libpoppler-qt4.so.%{poppler_qt4_sover}* - -%files -n libpoppler-qt4-devel -%defattr (-, root, root) -%dir %{_includedir}/poppler -%{_includedir}/poppler/qt4 -%{_libdir}/libpoppler-qt4.so -%{_libdir}/pkgconfig/poppler-qt4.pc - -%else %if %build_qt5 %files -n libpoppler-qt5-%{poppler_qt5_sover} @@ -350,9 +271,11 @@ %{_libdir}/libpoppler-glib.so %{_libdir}/pkgconfig/poppler-glib.pc %{_datadir}/gir-1.0/Poppler-%{poppler_api}.gir -#doc %%{_datadir}/gtk-doc/html/poppler/ +# Own these directories to not depend on gtk-doc while building: +#dir %%{_datadir}/gtk-doc/html +#dir %%{_datadir}/gtk-doc/html/poppler +#doc %%{_datadir}/gtk-doc/html/poppler %endif -%endif %changelog ++++++ poppler-0.61.1.tar.xz -> poppler-0.62.0.tar.xz ++++++ ++++ 29077 lines of diff (skipped) ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.MApGNH/_old 2018-01-09 14:48:02.606288749 +0100 +++ /var/tmp/diff_new_pack.MApGNH/_new 2018-01-09 14:48:02.610288562 +0100 @@ -1,8 +1,5 @@ #!/bin/sh -sed -e 's,build_qt 0,build_qt 1,' poppler.spec > poppler-qt.spec sed -e 's,build_qt5 0,build_qt5 1,' poppler.spec > poppler-qt5.spec -sed -e 's,^Name:.*,Name: poppler-qt,' -i poppler-qt.spec sed -e 's,^Name:.*,Name: poppler-qt5,' -i poppler-qt5.spec -cp poppler.changes poppler-qt.changes cp poppler.changes poppler-qt5.changes
