From 17289e4c2baf0773807559980d9000be5d902bed Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 25 Apr 2010 17:22:52 +0200
Subject: [PATCH] poppler: move so symlink into main pkg.

--HG--
extra : convert_revision : 512f3f59c5a0a05fc3a234dee0e63f2f63cd6c67
---
 srcpkgs/poppler/poppler-devel.template      | 3 ++-
 srcpkgs/poppler/poppler-glib-devel.template | 3 ++-
 srcpkgs/poppler/poppler-glib.template       | 4 +++-
 srcpkgs/poppler/poppler-qt4-devel.template  | 3 ++-
 srcpkgs/poppler/poppler-qt4.template        | 4 +++-
 srcpkgs/poppler/template                    | 1 +
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/poppler/poppler-devel.template b/srcpkgs/poppler/poppler-devel.template
index ba805740a5..70cf8b53f7 100644
--- a/srcpkgs/poppler/poppler-devel.template
+++ b/srcpkgs/poppler/poppler-devel.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run pkg-config
 Add_dependency run gtk+-devel
 Add_dependency run jpeg-devel
@@ -20,7 +22,6 @@ do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib/pkgconfig
 	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler.so ${DESTDIR}/usr/lib
 	for f in poppler poppler-splash; do
 		mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/${f}.pc \
 			${DESTDIR}/usr/lib/pkgconfig
diff --git a/srcpkgs/poppler/poppler-glib-devel.template b/srcpkgs/poppler/poppler-glib-devel.template
index cb1238f159..3ab18bc56c 100644
--- a/srcpkgs/poppler/poppler-glib-devel.template
+++ b/srcpkgs/poppler/poppler-glib-devel.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains development files for GTK+/Glib bindings."
 
+revision=1
+
 Add_dependency run pango-devel
 Add_dependency run freetype-devel
 Add_dependency run fontconfig-devel
@@ -24,7 +26,6 @@ do_install()
 	mv ${SRCPKGDESTDIR}/usr/include/poppler/glib \
 		${DESTDIR}/usr/include/poppler
 	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.so ${DESTDIR}/usr/lib
 	for f in poppler-cairo poppler-glib; do
 		mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/${f}.pc \
 			${DESTDIR}/usr/lib/pkgconfig
diff --git a/srcpkgs/poppler/poppler-glib.template b/srcpkgs/poppler/poppler-glib.template
index 95650539cc..b613274eee 100644
--- a/srcpkgs/poppler/poppler-glib.template
+++ b/srcpkgs/poppler/poppler-glib.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains ${sourcepkg} GTK/GLib bindings."
 
+revision=1
+
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
@@ -20,5 +22,5 @@ Add_dependency run poppler
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.so.* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.so* ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/poppler/poppler-qt4-devel.template b/srcpkgs/poppler/poppler-qt4-devel.template
index 0187115d70..11f7eac6ff 100644
--- a/srcpkgs/poppler/poppler-qt4-devel.template
+++ b/srcpkgs/poppler/poppler-qt4-devel.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains development files for QT 4 bindings."
 
+revision=1
+
 Add_dependency run glibc-devel
 Add_dependency run libstdc++-devel
 Add_dependency run zlib-devel
@@ -16,6 +18,5 @@ do_install()
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-qt4.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-qt4.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/poppler/poppler-qt4.template b/srcpkgs/poppler/poppler-qt4.template
index 105acb3bbe..47d5de1470 100644
--- a/srcpkgs/poppler/poppler-qt4.template
+++ b/srcpkgs/poppler/poppler-qt4.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains ${sourcepkg} QT 4 bindings."
 
+revision=1
+
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
@@ -16,5 +18,5 @@ Add_dependency run poppler
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-qt4.so.* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-qt4.so* ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index cdb969ac4d..280533f743 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -1,6 +1,7 @@
 # Template build file for 'poppler'.
 pkgname=poppler
 version=0.12.4
+revision=1
 distfiles="http://poppler.freedesktop.org/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-zlib --disable-poppler-qt