Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2013-07-11 13:30:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2013-06-25 14:44:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2013-07-11 13:30:14.000000000 +0200 @@ -1,0 +2,24 @@ +Tue Jul 9 08:09:18 UTC 2013 - [email protected] + +- Update to version 0.23.3 (0.24 beta3): + + core: + - Annotation improvements. + - Fix crashes on malformed files. + - TextSelectionPainter: Draw glyphs after selection background. + - TextOutputDev: add a method to TextPage to get the selection + as a list of words. + + qt5: + - Initial Qt5 port. + + qt4: + - Windows compile fixes. + - Demo: Allow the choose the page rotation. + + build system: + - Fix mingw build. + - Minor autotools fixes. +- Prepare spec file to build for Qt5 once it appears in Factory. +- Change poppler_data_version to 0.4.6, which is the version + provided since 2012. Note that this does not actually make a + different, as it's used in a Recommends, which does not care + much about the version. + +------------------------------------------------------------------- poppler.changes: same change Old: ---- poppler-0.22.5.tar.gz New: ---- poppler-0.23.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.0Ik6yI/_old 2013-07-11 13:30:16.000000000 +0200 +++ /var/tmp/diff_new_pack.0Ik6yI/_new 2013-07-11 13:30:16.000000000 +0200 @@ -17,14 +17,15 @@ %define build_qt 1 +%define build_qt5 0 Name: poppler-qt %define _name poppler -Version: 0.22.5 +Version: 0.23.3 Release: 0 # Actual version of poppler-data: -%define poppler_data_version 0.2.1 -%define poppler_soname 37 +%define poppler_data_version 0.4.6 +%define poppler_soname 41 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 @@ -34,7 +35,7 @@ Summary: PDF Rendering Library License: GPL-2.0 or GPL-3.0 Group: System/Libraries -Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.gz +Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.xz BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel BuildRequires: libjpeg-devel @@ -42,6 +43,9 @@ %if %build_qt BuildRequires: libqt4-devel %endif +%if %build_qt5 +BuildRequires: libqt5-devel +%endif %if 0%{?suse_version} > 1210 BuildRequires: openjpeg-devel %endif @@ -120,6 +124,18 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %endif +%if %build_qt5 + +%package -n libpoppler-qt5-%{poppler_qt5_soname} +Summary: PDF Rendering Library - Qt5 Wrapper +Group: System/Libraries +Requires: libpoppler%{poppler_soname} >= %{version} + +%description -n libpoppler-qt5-%{poppler_qt5_soname} +Poppler is a PDF rendering library, forked from the xpdf PDF viewer +developed by Derek Noonburg of Glyph and Cog, LLC. +%endif + %package tools Summary: PDF Rendering Library Tools Group: Productivity/Publishing/PDF @@ -180,6 +196,20 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %endif +%if %build_qt5 + +%package -n libpoppler-qt5-devel +Summary: PDF rendering library - Qt5 Wrapper +Group: Development/Libraries/C and C++ +Requires: libpoppler-devel = %{version} +Requires: libpoppler-qt5-%{poppler_qt5_soname} = %{version} +Requires: libqt5-devel + +%description -n libpoppler-qt5-devel +Poppler is a PDF rendering library, forked from the xpdf PDF viewer +developed by Derek Noonburg of Glyph and Cog, LLC. +%endif + %prep %setup -q -n poppler-%{version} @@ -195,7 +225,7 @@ %install %makeinstall rm %{buildroot}%{_libdir}/*.la -%if %build_qt +%if %build_qt || %build_qt5 cd %{buildroot} && find . -type f -o -type l | grep -v qt | xargs rm -v %endif @@ -235,6 +265,20 @@ %{_libdir}/pkgconfig/poppler-qt4.pc %else +%if %build_qt5 + +%files -n libpoppler-qt5-%{poppler_qt5_soname} +%defattr (-, root, root) +%{_libdir}/libpoppler-qt5.so.%{poppler_qt5_soname}* + +%files -n libpoppler-qt5-devel +%defattr (-, root, root) +%dir %{_includedir}/poppler +%{_includedir}/poppler/qt5 +%{_libdir}/libpoppler-qt5.so +%{_libdir}/pkgconfig/poppler-qt5.pc + +$else %files -n libpoppler%{poppler_soname} %defattr (-, root, root) @@ -279,5 +323,6 @@ %doc %{_datadir}/gtk-doc/html/poppler/ %endif +%endif %changelog ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.0Ik6yI/_old 2013-07-11 13:30:16.000000000 +0200 +++ /var/tmp/diff_new_pack.0Ik6yI/_new 2013-07-11 13:30:16.000000000 +0200 @@ -17,14 +17,15 @@ %define build_qt 0 +%define build_qt5 0 Name: poppler %define _name poppler -Version: 0.22.5 +Version: 0.23.3 Release: 0 # Actual version of poppler-data: -%define poppler_data_version 0.2.1 -%define poppler_soname 37 +%define poppler_data_version 0.4.6 +%define poppler_soname 41 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 @@ -34,7 +35,7 @@ Summary: PDF Rendering Library License: GPL-2.0 or GPL-3.0 Group: System/Libraries -Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.gz +Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.xz BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel BuildRequires: libjpeg-devel @@ -42,6 +43,9 @@ %if %build_qt BuildRequires: libqt4-devel %endif +%if %build_qt5 +BuildRequires: libqt5-devel +%endif %if 0%{?suse_version} > 1210 BuildRequires: openjpeg-devel %endif @@ -120,6 +124,18 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %endif +%if %build_qt5 + +%package -n libpoppler-qt5-%{poppler_qt5_soname} +Summary: PDF Rendering Library - Qt5 Wrapper +Group: System/Libraries +Requires: libpoppler%{poppler_soname} >= %{version} + +%description -n libpoppler-qt5-%{poppler_qt5_soname} +Poppler is a PDF rendering library, forked from the xpdf PDF viewer +developed by Derek Noonburg of Glyph and Cog, LLC. +%endif + %package tools Summary: PDF Rendering Library Tools Group: Productivity/Publishing/PDF @@ -180,6 +196,20 @@ developed by Derek Noonburg of Glyph and Cog, LLC. %endif +%if %build_qt5 + +%package -n libpoppler-qt5-devel +Summary: PDF rendering library - Qt5 Wrapper +Group: Development/Libraries/C and C++ +Requires: libpoppler-devel = %{version} +Requires: libpoppler-qt5-%{poppler_qt5_soname} = %{version} +Requires: libqt5-devel + +%description -n libpoppler-qt5-devel +Poppler is a PDF rendering library, forked from the xpdf PDF viewer +developed by Derek Noonburg of Glyph and Cog, LLC. +%endif + %prep %setup -q -n poppler-%{version} @@ -195,7 +225,7 @@ %install %makeinstall rm %{buildroot}%{_libdir}/*.la -%if %build_qt +%if %build_qt || %build_qt5 cd %{buildroot} && find . -type f -o -type l | grep -v qt | xargs rm -v %endif @@ -235,6 +265,20 @@ %{_libdir}/pkgconfig/poppler-qt4.pc %else +%if %build_qt5 + +%files -n libpoppler-qt5-%{poppler_qt5_soname} +%defattr (-, root, root) +%{_libdir}/libpoppler-qt5.so.%{poppler_qt5_soname}* + +%files -n libpoppler-qt5-devel +%defattr (-, root, root) +%dir %{_includedir}/poppler +%{_includedir}/poppler/qt5 +%{_libdir}/libpoppler-qt5.so +%{_libdir}/pkgconfig/poppler-qt5.pc + +%else %files -n libpoppler%{poppler_soname} %defattr (-, root, root) @@ -279,5 +323,6 @@ %doc %{_datadir}/gtk-doc/html/poppler/ %endif +%endif %changelog ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.0Ik6yI/_old 2013-07-11 13:30:16.000000000 +0200 +++ /var/tmp/diff_new_pack.0Ik6yI/_new 2013-07-11 13:30:16.000000000 +0200 @@ -1,5 +1,8 @@ #!/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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
