diff --git a/.gitignore b/.gitignore index 19a6021..6d9086e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /poppler-0.41.0.tar.xz /poppler-0.43.0.tar.xz /poppler-0.45.0.tar.xz +/poppler-0.48.0.tar.xz diff --git a/poppler-0.24.2-mocversiongrep.patch b/poppler-0.24.2-mocversiongrep.patch index 0fcc0df..786eae6 100644 --- a/poppler-0.24.2-mocversiongrep.patch +++ b/poppler-0.24.2-mocversiongrep.patch @@ -5,23 +5,23 @@ diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac AC_CHECK_TOOL(MOCQT5, moc) AC_MSG_CHECKING([for Qt5 moc]) mocversion=`$MOCQT5 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` -+ mocversiongrep=`echo $mocversion | grep " 5\."` +- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` ++ mocversiongrep=`echo $mocversion | grep -E " 5."` if test x"$mocversiongrep" != x"$mocversion"; then AC_MSG_RESULT([no]) # moc was not the qt5 one, try with moc-qt5 AC_CHECK_TOOL(MOCQT52, moc-qt5) AC_MSG_CHECKING([for Qt5 moc-qt5]) mocversion=`$MOCQT52 -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"` -+ mocversiongrep=`echo $mocversion | grep " 5\."` +- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"` ++ mocversiongrep=`echo $mocversion | grep -E " 5."` if test x"$mocversiongrep" != x"$mocversion"; then AC_CHECK_TOOL(QTCHOOSER, qtchooser) AC_MSG_CHECKING([for qtchooser]) qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` mocversion=`$qt5tooldir/moc -v 2>&1` -- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` -+ mocversiongrep=`echo $mocversion | grep " 5\."` +- mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"` ++ mocversiongrep=`echo $mocversion | grep -E " 5."` if test x"$mocversiongrep" != x"$mocversion"; then # no valid moc found enable_poppler_qt5=no; diff --git a/poppler.spec b/poppler.spec index d8f27aa..7135cc2 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,7 +1,7 @@ Summary: PDF rendering library Name: poppler -Version: 0.45.0 -Release: 2%{?dist} +Version: 0.48.0 +Release: 1%{?dist} License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT Group: Development/Libraries URL: http://poppler.freedesktop.org/ @@ -218,7 +218,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %files %defattr(-,root,root,-) %doc COPYING README -%{_libdir}/libpoppler.so.62* +%{_libdir}/libpoppler.so.64* %files devel %defattr(-,root,root,-) @@ -287,6 +287,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %changelog +* Fri Oct 21 2016 Marek Kasik - 0.48.0-1 +- Update to 0.48.0 +- Resolves: #1359555 + * Mon Sep 26 2016 Marek Kasik - 0.45.0-2 - Don't crash when calling cmsGetColorSpace() - Resolves: #1363669 diff --git a/sources b/sources index 3e7ba26..e2299f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a66e8c3cf6dab91dab5ba90d362c6063 poppler-0.45.0.tar.xz +8d61c91cb9e99ad38bba1b0b4432f174 poppler-0.48.0.tar.xz