From 8646c5d4c0bd4f8c7a0a148e63f7e96f9d4a50cf Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 22 Mar 2012 07:27:20 +0100 Subject: [PATCH] Revert "libgee: update to 0.7.2, bump abi_depends." This reverts commit 8151c0f65386c10cee51906772bc21a0fb1c7c3f. Dependent package are not ready for this yet. --- common/shlibs | 2 +- srcpkgs/libgee/depends | 2 +- srcpkgs/libgee/libgee-devel.template | 6 ++++-- srcpkgs/libgee/libgee.rshlibs | 3 +++ srcpkgs/libgee/template | 9 +++++---- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index da704cf5986..b00b49a839d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -726,7 +726,7 @@ libgjs-dbus.so.0 gjs gjs-devel libtelepathy-glib.so.0 telepathy-glib telepathy-glib-devel libgedit-private.so.0 gedit gedit-devel libaccountsservice.so.0 accountsservice accountsservice-devel -libgee-0.8.so.0 libgee libgee-devel +libgee.so.2 libgee libgee-devel libfolks.so.25 folks folks-devel libfolks-telepathy.so.25 folks folks-devel libfolks-libsocialweb.so.25 folks folks-devel diff --git a/srcpkgs/libgee/depends b/srcpkgs/libgee/depends index a3e5642e478..017786f6fa3 100644 --- a/srcpkgs/libgee/depends +++ b/srcpkgs/libgee/depends @@ -1,2 +1,2 @@ -abi_depends=">=0.7.2" +abi_depends=">=0.6.1" api_depends="${abi_depends}" diff --git a/srcpkgs/libgee/libgee-devel.template b/srcpkgs/libgee/libgee-devel.template index ccfa6449368..5831a5a0f6b 100644 --- a/srcpkgs/libgee/libgee-devel.template +++ b/srcpkgs/libgee/libgee-devel.template @@ -1,14 +1,16 @@ # Template file for 'libgee-devel'. # +revision=2 short_desc="${sourcepkg} - development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." Add_dependency run glib-devel -Add_dependency run libgee ">=${version}" +Add_dependency run libgee -do_install() { +do_install() +{ vmove "usr/lib/*.a" usr/lib vmove usr/include usr vmove usr/lib/pkgconfig usr/lib diff --git a/srcpkgs/libgee/libgee.rshlibs b/srcpkgs/libgee/libgee.rshlibs index cd9c49df3ae..9ba5b3529a7 100644 --- a/srcpkgs/libgee/libgee.rshlibs +++ b/srcpkgs/libgee/libgee.rshlibs @@ -1,3 +1,6 @@ libgobject-2.0.so.0 +libgthread-2.0.so.0 +librt.so.1 libglib-2.0.so.0 +libpthread.so.0 libc.so.6 diff --git a/srcpkgs/libgee/template b/srcpkgs/libgee/template index 202e8b637b8..d9e8ca4a4e5 100644 --- a/srcpkgs/libgee/template +++ b/srcpkgs/libgee/template @@ -1,14 +1,15 @@ # Template file for 'libgee' pkgname=libgee -version=0.7.2 +version=0.6.4 +revision=2 homepage="http://live.gnome.org/Libgee" -distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.xz" -configure_args="--enable-static --with-pic" +distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz" +configure_args="--enable-static --with-pic=yes" build_style=gnu-configure short_desc="GObject collection library" maintainer="Juan RP " license="LGPL-2.1" -checksum=1aee29104a4f5f661243ee5ca2e35a582dc7ff06bc3bd3fed9bf83e26af1b59c +checksum=55f39f3b28e676f6cbd9377d83edd031084436a4da41280a9503c94faffb1665 long_desc=" Libgee is a collection library providing GObject-based interfaces and classes for commonly used data structures."