poppler: update to 0.20.0, bump abi_depends.

common/shlibs

@@ -319,7 +319,7 @@ libMagickWand.so.5		libmagick		libmagick-devel
 libMagick++.so.5		libmagick		libmagick-devel
 libltdl.so.7			libltdl			libltdl-devel
 libpoppler-glib.so.8		poppler-glib		poppler-glib-devel
-libpoppler.so.19		poppler			poppler-devel
+libpoppler.so.25		poppler			poppler-devel
 libpoppler-cpp.so.0		poppler-cpp		poppler-cpp-devel
 libpoppler-qt4.so.3		poppler-qt4		poppler-qt4-devel
 libtcl8.5.so			tcl			tcl-devel

srcpkgs/poppler/depends

@@ -1,2 +1,2 @@
-abi_depends=">=0.18.2"
+abi_depends=">=0.20.0"
-api_depends=">=0.18.4_1"
+api_depends="${abi_depends}"

srcpkgs/poppler/poppler-cpp-devel.template

@@ -5,14 +5,11 @@ long_desc="${long_desc}
 
  This package contains development files for C++ bindings."
 
-revision=1
-
 Add_dependency run libstdc++-devel
 Add_dependency run zlib-devel
 Add_dependency run poppler-devel ">=${version}"
 
-do_install()
+do_install() {
-{
 	vmove usr/include/poppler/cpp usr/include/poppler
 	vmove usr/lib/libpoppler-cpp.a usr/lib
 	vmove usr/lib/pkgconfig/poppler-cpp.pc usr/lib/pkgconfig

srcpkgs/poppler/poppler-cpp.rshlibs

@@ -1,4 +1,3 @@
-liblcms.so.1
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -10,4 +9,5 @@ libm.so.6
 libc.so.6
 libgcc_s.so.1
 libtiff.so.5
-libpoppler.so.19
+libpoppler.so.25
+liblcms2.so.2

srcpkgs/poppler/poppler-cpp.template

@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains ${sourcepkg} C++ bindings."
 
-revision=1
-
 do_install() {
 	vmove "usr/lib/libpoppler-cpp.so*" usr/lib
 }

srcpkgs/poppler/poppler-devel.template

@@ -8,10 +8,7 @@ long_desc="${long_desc}
 Add_dependency run glib-devel
 Add_dependency run poppler ">=${version}"
 
-revision=1
+do_install() {
-
-do_install()
-{
 	vmove usr/include/poppler usr/include
 	vmove usr/lib/libpoppler.a usr/lib
 	vmove usr/lib/pkgconfig/poppler.pc usr/lib/pkgconfig

srcpkgs/poppler/poppler-glib-devel.template

@@ -8,10 +8,7 @@ long_desc="${long_desc}
 Add_dependency run poppler-devel ">=${version}"
 Add_dependency run poppler-glib ">=${version}"
 
-revision=1
+do_install() {
-
-do_install()
-{
 	vmove usr/include/poppler/glib usr/include/poppler
 	vmove usr/lib/libpoppler-glib.a usr/lib
 	vmove usr/share/gir-1.0 usr/share

srcpkgs/poppler/poppler-glib.rshlibs

@@ -1,4 +1,3 @@
-liblcms.so.1
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -13,4 +12,5 @@ libm.so.6
 libc.so.6
 libgcc_s.so.1
 libtiff.so.5
-libpoppler.so.19
+libpoppler.so.25
+liblcms2.so.2

srcpkgs/poppler/poppler-glib.template

@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains ${sourcepkg} GTK/GLib bindings."
 
-revision=1
-
 do_install() {
 	vmove "usr/lib/libpoppler-glib.so*" usr/lib
 	vmove usr/lib/girepository-1.0 usr/lib

srcpkgs/poppler/poppler-utils.rshlibs

@@ -2,8 +2,8 @@ libstdc++.so.6
 libpthread.so.0
 libc.so.6
 libm.so.6
-liblcms.so.1
 libfreetype.so.6
 libcairo.so.2
 libgcc_s.so.1	i686
-libpoppler.so.19
+libpoppler.so.25
+liblcms2.so.2

srcpkgs/poppler/poppler-utils.template

@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains the ${sourcepkg} binary utilities."
 
-revision=2
-
 do_install() {
 	vmove usr/bin usr
 	vmove usr/share/man usr/share

srcpkgs/poppler/poppler.rshlibs

@@ -1,4 +1,3 @@
-liblcms.so.1
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -10,3 +9,4 @@ libm.so.6
 libc.so.6
 libgcc_s.so.1
 libtiff.so.5
+liblcms2.so.2

srcpkgs/poppler/template

@@ -1,7 +1,6 @@
 # Template build file for 'poppler'.
 pkgname=poppler
-version=0.18.4
+version=0.20.0
-revision=1
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/$pkgname-$version.tar.gz"
 build_style=gnu-configure
@@ -11,7 +10,7 @@ configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-checksum=33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e
+checksum=b2e3253c2f4af248a2ffaac29161de6e462c587031e7875287b9956b45a0570d
 long_desc="
  This is poppler, a PDF rendering library. It is a fork of the xpdf
  3.0 PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC.
@@ -29,5 +28,7 @@ subpackages="$subpackages $pkgname-devel"
 Add_dependency build pkg-config
 Add_dependency build gobject-introspection
 Add_dependency build tiff-devel
-Add_dependency build lcms-devel
+Add_dependency build lcms2-devel
 Add_dependency build libcurl-devel
+
+Add_dependency full poppler-data