From c4ebaf2be30b5f1e82f49ffb3539088c9175ee69 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 22 Mar 2012 12:25:58 +0100
Subject: [PATCH] libchamplain: rebuild against newer clutter/cogl.

---
 srcpkgs/libchamplain/depends                     | 2 +-
 srcpkgs/libchamplain/libchamplain-devel.template | 7 ++++---
 srcpkgs/libchamplain/libchamplain.rshlibs        | 9 ++-------
 srcpkgs/libchamplain/template                    | 3 ++-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/libchamplain/depends b/srcpkgs/libchamplain/depends
index f90b51d01a5..8698f59978b 100644
--- a/srcpkgs/libchamplain/depends
+++ b/srcpkgs/libchamplain/depends
@@ -1,2 +1,2 @@
-abi_depends=">=0.12.0"
+abi_depends=">=0.12.2_1"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/libchamplain/libchamplain-devel.template b/srcpkgs/libchamplain/libchamplain-devel.template
index b8c0bb48df4..88758e9686a 100644
--- a/srcpkgs/libchamplain/libchamplain-devel.template
+++ b/srcpkgs/libchamplain/libchamplain-devel.template
@@ -5,19 +5,20 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libsoup-devel
 Add_dependency run libsoup-gnome-devel
 Add_dependency run gtk+3-devel
 Add_dependency run clutter-gtk-devel
 Add_dependency run json-glib-devel
 Add_dependency run sqlite-devel
-Add_dependency run ${sourcepkg}
+Add_dependency run ${sourcepkg} ">=${version}"
+
+revision=1
+noarch=yes
 
 do_install() {
 	vmove usr/include usr
 	vmove usr/share/gir-1.0 usr/share
 	vmove usr/share/gtk-doc usr/share
 	vmove usr/share/vala usr/share
-	vmove "usr/lib/*.a" usr/lib
 	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/libchamplain/libchamplain.rshlibs b/srcpkgs/libchamplain/libchamplain.rshlibs
index 80cf03a2237..d6042be348a 100644
--- a/srcpkgs/libchamplain/libchamplain.rshlibs
+++ b/srcpkgs/libchamplain/libchamplain.rshlibs
@@ -1,14 +1,10 @@
 libgdk-3.so.0
-libclutter-glx-1.0.so.0
 libcairo-gobject.so.2
 libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
-libGL.so.1
-libpangoft2-1.0.so.0
 libXi.so.6
-libcogl.so.5
 libgdk_pixbuf-2.0.so.0
 libdrm.so.2
 libX11.so.6
@@ -16,8 +12,6 @@ libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
 libpango-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1
 libXfixes.so.3
 libcairo.so.2
 libsqlite3.so.0
@@ -26,7 +20,6 @@ libsoup-2.4.so.1
 libgio-2.0.so.0
 libgobject-2.0.so.0
 libgmodule-2.0.so.0
-libgthread-2.0.so.0
 librt.so.1
 libglib-2.0.so.0
 libm.so.6
@@ -34,3 +27,5 @@ libpthread.so.0
 libc.so.6
 libclutter-gtk-1.0.so.0
 libgtk-3.so.0
+libclutter-1.0.so.0
+libcogl.so.9
diff --git a/srcpkgs/libchamplain/template b/srcpkgs/libchamplain/template
index c0a734be933..9807a0a28fa 100644
--- a/srcpkgs/libchamplain/template
+++ b/srcpkgs/libchamplain/template
@@ -1,9 +1,10 @@
 # Template file for 'libchamplain'
 pkgname=libchamplain
 version=0.12.2
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--disable-debug"
+configure_args="--disable-debug --disable-static"
 short_desc="Library aimed to provide a Clutter widget to display rasterized maps"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e