rpms/poppler
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.48.0

Browse Source 
Resolves: #1359555
This commit is contained in:
Marek Kasik 2016-10-21 13:10:56 +02:00
parent 9560bc93e0
commit c2806e5559
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -23,3 +23,4 @@
/poppler-0.41.0.tar.xz /poppler-0.41.0.tar.xz
/poppler-0.43.0.tar.xz /poppler-0.43.0.tar.xz
/poppler-0.45.0.tar.xz /poppler-0.45.0.tar.xz
/poppler-0.48.0.tar.xz

12
poppler-0.24.2-mocversiongrep.patch
View File

@ -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_CHECK_TOOL(MOCQT5, moc)
AC_MSG_CHECKING([for Qt5 moc]) AC_MSG_CHECKING([for Qt5 moc])
mocversion=`$MOCQT5 -v 2>&1` mocversion=`$MOCQT5 -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` - mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
+ mocversiongrep=`echo $mocversion | grep " 5\."` + mocversiongrep=`echo $mocversion | grep -E " 5."`
if test x"$mocversiongrep" != x"$mocversion"; then if test x"$mocversiongrep" != x"$mocversion"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
# moc was not the qt5 one, try with moc-qt5 # moc was not the qt5 one, try with moc-qt5
AC_CHECK_TOOL(MOCQT52, moc-qt5) AC_CHECK_TOOL(MOCQT52, moc-qt5)
AC_MSG_CHECKING([for Qt5 moc-qt5]) AC_MSG_CHECKING([for Qt5 moc-qt5])
mocversion=`$MOCQT52 -v 2>&1` mocversion=`$MOCQT52 -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"` - mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
+ mocversiongrep=`echo $mocversion | grep " 5\."` + mocversiongrep=`echo $mocversion | grep -E " 5."`
if test x"$mocversiongrep" != x"$mocversion"; then if test x"$mocversiongrep" != x"$mocversion"; then
AC_CHECK_TOOL(QTCHOOSER, qtchooser) AC_CHECK_TOOL(QTCHOOSER, qtchooser)
AC_MSG_CHECKING([for qtchooser]) AC_MSG_CHECKING([for qtchooser])
qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
mocversion=`$qt5tooldir/moc -v 2>&1` mocversion=`$qt5tooldir/moc -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` - mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
+ mocversiongrep=`echo $mocversion | grep " 5\."` + mocversiongrep=`echo $mocversion | grep -E " 5."`
if test x"$mocversiongrep" != x"$mocversion"; then if test x"$mocversiongrep" != x"$mocversion"; then
# no valid moc found # no valid moc found
enable_poppler_qt5=no; enable_poppler_qt5=no;

10
poppler.spec
View File

@ -1,7 +1,7 @@
Summary: PDF rendering library Summary: PDF rendering library
Name: poppler Name: poppler
Version: 0.45.0 Version: 0.48.0
Release: 2%{?dist} Release: 1%{?dist}
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
Group: Development/Libraries Group: Development/Libraries
URL: http://poppler.freedesktop.org/ URL: http://poppler.freedesktop.org/
@ -218,7 +218,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING README %doc COPYING README
%{_libdir}/libpoppler.so.62* %{_libdir}/libpoppler.so.64*
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -287,6 +287,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%changelog %changelog
* Fri Oct 21 2016 Marek Kasik <mkasik@redhat.com> - 0.48.0-1
- Update to 0.48.0
- Resolves: #1359555
* Mon Sep 26 2016 Marek Kasik <mkasik@redhat.com> - 0.45.0-2 * Mon Sep 26 2016 Marek Kasik <mkasik@redhat.com> - 0.45.0-2
- Don't crash when calling cmsGetColorSpace() - Don't crash when calling cmsGetColorSpace()
- Resolves: #1363669 - Resolves: #1363669

2
sources
View File

@ -1 +1 @@
a66e8c3cf6dab91dab5ba90d362c6063 poppler-0.45.0.tar.xz 8d61c91cb9e99ad38bba1b0b4432f174 poppler-0.48.0.tar.xz