[arch-commits] Commit in poppler/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, March 29, 2009 @ 06:40:41
  Author: jgc
Revision: 31938

Merged revisions 30776 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/poppler/trunk

........
  r30776 | jgc | 2009-03-21 22:59:38 +0000 (Sat, 21 Mar 2009) | 2 lines
  
  upgpkg: poppler 0.10.5-1
      Move poppler-data as optdepend to a standalone package. Depend on openjpeg as advised during configure
........

Modified:
  poppler/repos/extra-i686/	(properties)
  poppler/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)


Property changes on: poppler/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /poppler/trunk:1-22388
   + /poppler/trunk:1-31937

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-29 10:39:18 UTC (rev 31937)
+++ extra-i686/PKGBUILD	2009-03-29 10:40:41 UTC (rev 31938)
@@ -2,20 +2,18 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=poppler
-pkgver=0.10.2
-_dataver=0.2.1
+pkgver=0.10.5
 pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0"
 arch=(i686 x86_64)
-license=('GPL' 'custom')
-depends=('libjpeg' 'gcc-libs>=4.3.2' 'cairo>=1.8.6' 'libxml2>=2.6.32-5' 'fontconfig>=2.6.0')
+license=('GPL')
+depends=('libjpeg' 'gcc-libs>=4.3.3' 'cairo>=1.8.6' 'libxml2>=2.7.3' 'fontconfig>=2.6.0' 'openjpeg>=1.3-3')
 makedepends=('pkgconfig')
+optdepends=('poppler-data')
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
-source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz
-	http://poppler.freedesktop.org/poppler-data-${_dataver}.tar.gz)
-md5sums=('a802a178d12f453f1d0176d67f923c7d'
-         'bca78b8786746c7b48b324283992d658')
+source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz)
+md5sums=('125f671a19707861132fb03e73b61184')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,10 +28,4 @@
 	      --disable-gtk-test || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
-
-  cd "${srcdir}/poppler-data-${_dataver}" || return 1
-  make prefix=/usr DESTDIR="${pkgdir}" install || return 1
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }