From 4d0fb2b9e8f5591ed3e28484585388dc3341e44d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 21 Nov 2006 12:27:01 +0000
Subject: libsoup: Drop old verison, fix 2.2.96 staging

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@923 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/gnome/libsoup_2.2.7.bb  | 17 -----------------
 meta/packages/gnome/libsoup_2.2.96.bb |  7 +++----
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 meta/packages/gnome/libsoup_2.2.7.bb

(limited to 'meta/packages')

diff --git a/meta/packages/gnome/libsoup_2.2.7.bb b/meta/packages/gnome/libsoup_2.2.7.bb
deleted file mode 100644
index 4c29dbd79..000000000
--- a/meta/packages/gnome/libsoup_2.2.7.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "An HTTP library implementation in C"
-SECTION = "x11/gnome/libs"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
-DEPENDS = "glib-2.0 gnutls libxml2"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir} ${libdir}"
-FILES_${PN}-doc = "${datadir}"
-
-do_stage() {
-	autotools_stage_all
-	install -d ${STAGING_DATADIR}/pkgconfig
-	install -m 0644 ${D}${libdir}/pkgconfig/* ${STAGING_DATADIR}/pkgconfig/
-}
diff --git a/meta/packages/gnome/libsoup_2.2.96.bb b/meta/packages/gnome/libsoup_2.2.96.bb
index a222634b4..d6fc8a540 100644
--- a/meta/packages/gnome/libsoup_2.2.96.bb
+++ b/meta/packages/gnome/libsoup_2.2.96.bb
@@ -7,11 +7,10 @@ DEPENDS = "glib-2.0 gnutls libxml2"
 inherit autotools pkgconfig
 
 FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir} ${libdir}"
-FILES_${PN}-doc = "${datadir}"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
 
 do_stage() {
 	autotools_stage_all
-	install -d ${STAGING_DATADIR}/pkgconfig
-	install -m 0644 ${S}/libsoup.pc ${STAGING_DATADIR}/pkgconfig/
+	ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc
 }
-- 
cgit v1.2.3