[packages/poppler] - up to 0.26.0 (soname change)

atler atler at pld-linux.org
Thu May 1 17:13:40 CEST 2014


commit 12006cce0f8405b459ff8519fa22dff0bd2a8300
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu May 1 17:13:09 2014 +0200

    - up to 0.26.0 (soname change)

 poppler-qt5.patch | 12 ++++++------
 poppler.spec      |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/poppler.spec b/poppler.spec
index 9668116..bf11e3e 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -11,12 +11,12 @@
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.24.4
-Release:	3
+Version:	0.26.0
+Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.xz
-# Source0-md5:	2da22b966cf7a2f8da5bf021e68188ce
+# Source0-md5:	76c3b2f18002a0f1e2bbbc7cccd1b957
 Patch0:		%{name}-qt5.patch
 URL:		http://poppler.freedesktop.org/
 %{?with_qt5:BuildRequires:	Qt5Core-devel >= 5.0.0}
@@ -378,7 +378,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README* TODO
 %attr(755,root,root) %{_libdir}/libpoppler.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.44
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.46
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/poppler-qt5.patch b/poppler-qt5.patch
index 5577da2..61ff55f 100644
--- a/poppler-qt5.patch
+++ b/poppler-qt5.patch
@@ -4,23 +4,23 @@
    AC_CHECK_TOOL(MOCQT5, moc)
    AC_MSG_CHECKING([for Qt5 moc])
    mocversion=`$MOCQT5 -v 2>&1`
--  mocversiongrep=`echo $mocversion | grep "Qt 5"`
-+  mocversiongrep=`echo $mocversion | grep -E "Qt 5| 5\.[[0-9]]"`
+-  mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
++  mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5| 5\.[[0-9]]"`
    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"`
-+    mocversiongrep=`echo $mocversion | grep -E "Qt 5| 5\.[[0-9]]"`
+-    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
++    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5| 5\.[[0-9]]"`
      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"`
-+      mocversiongrep=`echo $mocversion | grep -E "Qt 5| 5\.[[0-9]]"`
+-      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
++      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5| 5\.[[0-9]]"`
        if test x"$mocversiongrep" != x"$mocversion"; then
          # no valid moc found
          enable_poppler_qt5=no;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poppler.git/commitdiff/12006cce0f8405b459ff8519fa22dff0bd2a8300



More information about the pld-cvs-commit mailing list