Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2014-06-19 13:19:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-02 19:21:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2014-06-19 13:19:46.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 30 18:30:39 UTC 2014 - hrvoje.sen...@gmail.com + +- Enable build of Qt5 subpackage +- Disable poppler-glib and poppler-cpp building with Qt4/5 subpackages + +------------------------------------------------------------------- New Changes file: --- /dev/null 2014-06-12 08:28:52.960034756 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt5.changes 2014-06-19 13:19:46.000000000 +0200 @@ -0,0 +1,2152 @@ +------------------------------------------------------------------- +Wed Apr 30 18:30:39 UTC 2014 - hrvoje.sen...@gmail.com + +- Enable build of Qt5 subpackage +- Disable poppler-glib and poppler-cpp building with Qt4/5 subpackages + +------------------------------------------------------------------- +Tue Apr 29 08:24:33 UTC 2014 - zai...@opensuse.org + +- Update to version 0.26.0: + + qt4: Fix mismatched boolean logic in + TextAnnotation::setInplaceIntent. + + qt5: Fix mismatched boolean logic in + TextAnnotation::setInplaceIntent. + + core: Very small code cleanup. + + cpp: Very small code cleanup. +- Changes from version 0.25.3: + + core: + - Fix crashes on broken files. + - Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX. + - Fix some small memory leaks. + + qt5: + - Fix some kinds of OCG models. + - Cleanup some deprecated methods. + + glib: + - Fix the first coord of the quadrilateral in + create_poppler_quads_from_annot_quads() (fdo#76504). + + utils: pdftohtml: Fix typo in manpage. + + qt4: Fix some kinds of OCG models. +- Changes from version 0.25.2: + + core: + - Tagged-PDF support. + - Open some broken files (fdo#75232). + - Fix crashes on broken files. + - Fix regression parsing some broken files (kde#329600). + - Improve compilation under Win 8 with Visual Studio 2012 + (fdo#73111). + - PSOutputDev: + . Ensure paper size takes into account rotation (fdo#72312). + . Fix DocumentMedia/Page/Media/PageBBox DSC comments. + . Use crop box as page size. + . Remove origpagesizes mode and make -origpagesizes an alias + for -paper match. + . Only change paper size when different to previous size. + . Ensure there is always a page size in the output. + . Fix regression when creating level1 PS (fdo#75241). + - CairoOutputDev: Clip to crop box (bgo#649886). + - Splash: + . Blend usage in PDF with spot colors casue random + output (fdo#74883). + . Fix off by one that caused crash in a file (fdo#76387). + - Make sure number of least objects in hints table is valid + (fdo#74741). + - Limit numeric parsing of character names (fdo#38456). + + glib: + - Tagged-PDF support. + - Annotation improvements. + - Install error callback (fdo#73269). + - Fix gobject-introspection warnings. + - demo: Fix performance in text markup annotations. + - Increase gtk3 dependency. + + qt4: + - Improve naming of internal export/import macros. + - Add GCC visibility export attributes. + - Expose document-supplied text direction. + + qt5: + - Improve naming of internal export/import macros. + - Add GCC visibility export attributes. + - Expose document-supplied text direction. + + utils: + - pdftocairo: Ensure page size and crop box works the same as + pdftops. + - Fix TIFF writting in Windows (fdo#75969). + + buildsystem: + - Learn about automake 1.14. + - Do not define -ansi (fdo#72499). + - cmake: + . Install JpegWriter.h depending on libjpeg + . Use c99 for the c compiler. +- Changes from version 0.25.1: + + core: + - GooString format: + . Added some tests + improved documentation. + . Fixed bug with printing LLONG_MIN. + - Regression test improvements. + + qt4: + - Arthur backend font rendering improvements. + - Test program to save to file. + + qt5: + - Arthur backend font rendering improvements. + - Improve detection of Qt5 moc (fdo#72744). + - Test program to save to file. + + utils: + - pdfunite: + . Work even if there's a single file given. + . Do not lose fonts when merging some files. +- Changes from version 0.25.0: + + core: + - Annotation improvements. + - Tagged PDF work. + - Improve speed on some files using ICC color space. + - Use ICC profile in OutputIntents (fdo#34053). + - Limit use of ZapfDingbats character names (fdo#60243). + - Splash: correction for knockout transparency groups. + - Regression test improvements. + + utils: + - pdftoppm: Added thinlinemode option setting. + - pdfinfo: + . Indicate if pdf contains javascript. + . Add option to print out javascript. + - pdfimages: + . Print size, ratio, and ppi. + . More image output format support. + - pdfseparate: allow zero-padded pagespecs. + + glib: + - Annotation improvements. + - Add API to get text, text layout and text attributes for a + given area. + - Demo improvements. +- Bump soname following upstream changes. + +------------------------------------------------------------------- +Wed Feb 26 17:01:08 UTC 2014 - dap.darkn...@gmail.com + +- bnc#864299 was fixed: libpoppler-devel includes poppler-cpp.pc + and libpoppler-cpp.so (symlink to libpoppler-cpp.so.*). + So libpoppler-devel must require libpoppler-cpp. + +------------------------------------------------------------------- +Sun Jan 19 20:22:13 UTC 2014 - zai...@opensuse.org + +- Update to version 0.24.5: + + core: Fix crash due to wrong formatting of error message + (kde#328511). + +------------------------------------------------------------------- +Sat Dec 7 23:17:46 UTC 2013 - zai...@opensuse.org + +- Update to version 0.24.4: + + core: + - Fix regression in broken endstream detection (fdo#70854). + - Catalog: sort entries of NameTrees to make sure lookup works + (fdo#26049). + - Don't infinite loop if reading from GooFile::read fails + (fdo#71835). + + utils: + - pdftotext: + . Do not close stdout (fd0#71639). + . Silence warning for may be used uninitialized variable + (fdo#71640). + . Escape the text of the xml headers. + - Warn the user if he provides a wrong range + + qt4: + - Fix typo in xml API (fdo#71643). + + qt5: + - Fix typo in xml API (fdo#71643). +- Bump soname following upstream changes. + +------------------------------------------------------------------- +Tue Oct 29 13:07:57 UTC 2013 - zai...@opensuse.org + +- Update to version 0.24.3: + + core: + - PSOutputDev: Fix PFB font embedding (fdo#69717). + - CairoOutputDev: Do not set an invalid matrix in drawImage() + (fdo#70085). + + qt4: + - Don't crash if getXRef()->copy() fails. + + qt5: + - Don't crash if getXRef()->copy() fails. + + utils: + - pdfseparate: Allow only one %d in the filename (fdo#69434). +- This version fixes bnc#847907; CVE-2013-4473 and CVE-2013-4474. + +------------------------------------------------------------------- +Sat Sep 28 15:11:00 UTC 2013 - zai...@opensuse.org + +- Update to version 0.24.2: + + core: + - Windows: Fix CreateFile fails with ERROR_SHARING_VIOLATION + (fdo#69597). + + utils: + - pdfseparate: improve the path building. + - pdftocairo: check file opening failure in beginDocument(). + +------------------------------------------------------------------- +Wed Aug 30 13:06:18 UTC 2013 - zai...@opensuse.org + +- Update to version 0.24.1: + + core: + - SplashOutputDev: use getRGBLine images if available + (fdo#66928). + - SplashOutputDev: Don't copy bitmap if we don't need to. + - PSOutputDev: Fix regression in -eps -level1sep rendering + (fdo#68321). + - Fix crash in malformed file. Use copyString instead of strdup + where memory is freed with gfree (fdo#67666). ++++ 1955 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt5.changes --- /work/SRC/openSUSE:Factory/poppler/poppler.changes 2014-05-02 19:21:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler.changes 2014-06-19 13:19:46.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 30 18:30:39 UTC 2014 - hrvoje.sen...@gmail.com + +- Enable build of Qt5 subpackage +- Disable poppler-glib and poppler-cpp building with Qt4/5 subpackages + +------------------------------------------------------------------- New: ---- poppler-qt5.changes poppler-qt5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.KEPiBo/_old 2014-06-19 13:19:47.000000000 +0200 +++ /var/tmp/diff_new_pack.KEPiBo/_new 2014-06-19 13:19:47.000000000 +0200 @@ -46,6 +46,10 @@ %endif %if %build_qt5 BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) %endif %if 0%{?suse_version} > 1210 BuildRequires: openjpeg-devel @@ -206,6 +210,9 @@ Requires: libpoppler-devel = %{version} Requires: libpoppler-qt5-%{poppler_qt5_soname} = %{version} Requires: pkgconfig(Qt5Core) +Requires: pkgconfig(Qt5Gui) +Requires: pkgconfig(Qt5Widgets) +Requires: pkgconfig(Qt5Xml) %description -n libpoppler-qt5-devel Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -216,11 +223,27 @@ %setup -q -n poppler-%{version} %build +%if %build_qt5 +export MOCQT5='%{_libqt5_bindir}/moc' +export MOCQT52='%{_libqt5_bindir}/moc' +%endif %configure\ --enable-xpdf-headers\ --disable-static\ --enable-shared\ --enable-zlib \ +%if %build_qt5 + --enable-poppler-qt5 \ + --disable-poppler-qt4 \ + --disable-poppler-glib \ + --disable-poppler-cpp \ +%endif +%if %build_qt + --enable-poppler-qt4 \ + --disable-poppler-qt5 \ + --disable-poppler-glib \ + --disable-poppler-cpp \ +%endif --disable-gtk-test make %{?_smp_mflags} ++++++ poppler-qt5.spec ++++++ # # spec file for package poppler-qt5 # # Copyright (c) 2014 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define build_qt 0 %define build_qt5 1 Name: poppler-qt5 %define _name poppler Version: 0.26.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 %define poppler_soname 46 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 %define poppler_qt5_soname 1 %define poppler_api 0.18 %define poppler_apipkg 0_18 Url: http://poppler.freedesktop.org/ Summary: PDF Rendering Library License: GPL-2.0 or GPL-3.0 Group: System/Libraries Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.xz BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel %if %build_qt BuildRequires: libqt4-devel %endif %if %build_qt5 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) %endif %if 0%{?suse_version} > 1210 BuildRequires: openjpeg-devel %endif BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(cairo) >= 1.10.0 BuildRequires: pkgconfig(cairo-ft) >= 1.10.0 BuildRequires: pkgconfig(cairo-pdf) BuildRequires: pkgconfig(cairo-ps) BuildRequires: pkgconfig(cairo-svg) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) >= 2.18 BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libpng) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler%{poppler_soname} 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_soname} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-cpp%{poppler_cpp_soname} Summary: PDF Rendering Library Group: System/Libraries %description -n libpoppler-cpp%{poppler_cpp_soname} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-glib%{poppler_glib_soname} Summary: PDF Rendering Library - GLib Wrapper Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-glib = %{version} Obsoletes: poppler-glib < %{version} %description -n libpoppler-glib%{poppler_glib_soname} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %package -n typelib-1_0-Poppler-%{poppler_apipkg} Summary: PDF Rendering Library - Introspection bindings Group: System/Libraries %description -n typelib-1_0-Poppler-%{poppler_apipkg} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. This package provides the GObject Introspection bindings for Poppler. %if %build_qt %package -n libpoppler-qt4-%{poppler_qt4_soname} Summary: PDF Rendering Library - Qt4 Wrapper Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-qt4 = %{version} Obsoletes: poppler-qt4 < %{version} %description -n libpoppler-qt4-%{poppler_qt4_soname} Poppler is a PDF rendering library, forked from the xpdf PDF viewer 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 Requires: libpoppler%{poppler_soname} >= %{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 developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-devel Summary: PDF rendering library Group: Development/Libraries/C and C++ Requires: libpoppler%{poppler_soname} = %{version} Requires: libpoppler-cpp%{poppler_cpp_soname} = %{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 developed by Derek Noonburg of Glyph and Cog, LLC. %package -n libpoppler-glib-devel Summary: PDF rendering library - GLib Wrapper Group: Development/Libraries/C and C++ Requires: libpoppler-glib%{poppler_glib_soname} = %{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. %if %build_qt %package -n libpoppler-qt4-devel Summary: PDF rendering library - Qt4 Wrapper Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{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. %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: pkgconfig(Qt5Core) Requires: pkgconfig(Qt5Gui) Requires: pkgconfig(Qt5Widgets) Requires: pkgconfig(Qt5Xml) %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} %build %if %build_qt5 export MOCQT5='%{_libqt5_bindir}/moc' export MOCQT52='%{_libqt5_bindir}/moc' %endif %configure\ --enable-xpdf-headers\ --disable-static\ --enable-shared\ --enable-zlib \ %if %build_qt5 --enable-poppler-qt5 \ --disable-poppler-qt4 \ --disable-poppler-glib \ --disable-poppler-cpp \ %endif %if %build_qt --enable-poppler-qt4 \ --disable-poppler-qt5 \ --disable-poppler-glib \ --disable-poppler-cpp \ %endif --disable-gtk-test make %{?_smp_mflags} %install %makeinstall rm %{buildroot}%{_libdir}/*.la %if %build_qt || %build_qt5 cd %{buildroot} && find . -type f -o -type l | grep -v qt | xargs rm -v %endif %post -n libpoppler%{poppler_soname} -p /sbin/ldconfig %post -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig %if %build_qt %post -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig %endif %if %build_qt5 %post -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig %endif %postun -n libpoppler%{poppler_soname} -p /sbin/ldconfig %postun -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig %post -n libpoppler-cpp%{poppler_cpp_soname} -p /sbin/ldconfig %postun -n libpoppler-cpp%{poppler_cpp_soname} -p /sbin/ldconfig %if %build_qt %postun -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig %endif %if %build_qt5 %postun -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig %endif %if %build_qt %files -n libpoppler-qt4-%{poppler_qt4_soname} %defattr (-, root, root) %{_libdir}/libpoppler-qt4.so.%{poppler_qt4_soname}* %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_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) %doc AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO %{_libdir}/libpoppler.so.%{poppler_soname}* %files -n libpoppler-glib%{poppler_glib_soname} %defattr (-, root, root) %{_libdir}/libpoppler-glib.so.%{poppler_glib_soname}* %files -n typelib-1_0-Poppler-%{poppler_apipkg} %defattr (-, root, root) %{_libdir}/girepository-1.0/Poppler-%{poppler_api}.typelib %files tools %defattr (-, root, root) %doc COPYING %{_bindir}/* %doc %{_mandir}/man1/*.* %files -n libpoppler-cpp%{poppler_cpp_soname} %defattr(-, root, root) %{_libdir}/libpoppler-cpp.so.%{poppler_cpp_soname}* %files -n libpoppler-devel %defattr (-, root, root) %{_includedir}/poppler %exclude %{_includedir}/poppler/glib %{_libdir}/libpoppler.so %{_libdir}/libpoppler-cpp.so %{_libdir}/pkgconfig/poppler.pc %{_libdir}/pkgconfig/poppler-cairo.pc %{_libdir}/pkgconfig/poppler-cpp.pc %{_libdir}/pkgconfig/poppler-splash.pc %files -n libpoppler-glib-devel %defattr (-, root, root) %{_includedir}/poppler/glib %{_libdir}/libpoppler-glib.so %{_libdir}/pkgconfig/poppler-glib.pc %{_datadir}/gir-1.0/Poppler-%{poppler_api}.gir %doc %{_datadir}/gtk-doc/html/poppler/ %endif %endif %changelog ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.KEPiBo/_old 2014-06-19 13:19:47.000000000 +0200 +++ /var/tmp/diff_new_pack.KEPiBo/_new 2014-06-19 13:19:47.000000000 +0200 @@ -46,6 +46,10 @@ %endif %if %build_qt5 BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) %endif %if 0%{?suse_version} > 1210 BuildRequires: openjpeg-devel @@ -206,6 +210,9 @@ Requires: libpoppler-devel = %{version} Requires: libpoppler-qt5-%{poppler_qt5_soname} = %{version} Requires: pkgconfig(Qt5Core) +Requires: pkgconfig(Qt5Gui) +Requires: pkgconfig(Qt5Widgets) +Requires: pkgconfig(Qt5Xml) %description -n libpoppler-qt5-devel Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -216,11 +223,27 @@ %setup -q -n poppler-%{version} %build +%if %build_qt5 +export MOCQT5='%{_libqt5_bindir}/moc' +export MOCQT52='%{_libqt5_bindir}/moc' +%endif %configure\ --enable-xpdf-headers\ --disable-static\ --enable-shared\ --enable-zlib \ +%if %build_qt5 + --enable-poppler-qt5 \ + --disable-poppler-qt4 \ + --disable-poppler-glib \ + --disable-poppler-cpp \ +%endif +%if %build_qt + --enable-poppler-qt4 \ + --disable-poppler-qt5 \ + --disable-poppler-glib \ + --disable-poppler-cpp \ +%endif --disable-gtk-test make %{?_smp_mflags} ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.KEPiBo/_old 2014-06-19 13:19:47.000000000 +0200 +++ /var/tmp/diff_new_pack.KEPiBo/_new 2014-06-19 13:19:47.000000000 +0200 @@ -1,8 +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,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 +sed -e 's,^Name:.*,Name: poppler-qt5,' -i poppler-qt5.spec cp poppler.changes poppler-qt.changes -#cp poppler.changes poppler-qt5.changes +cp poppler.changes poppler-qt5.changes -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org