From 676ee8f6c7b2ca741a337d98bf1abf0c668b45ac Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 7 May 2008 10:03:07 +0000
Subject: libsoup: modify staging funciton to not symlink, we don't want
 libsoup.pc, but libsoup-2.x.pc epiphany: depend on libsoup-2.4

---
 packages/gnome/epiphany_2.22.1.bb   |  2 +-
 packages/gnome/libsoup-2.4_2.4.1.bb | 21 +++++++++++++++++++++
 packages/gnome/libsoup_2.2.100.bb   |  5 +++--
 packages/gnome/libsoup_2.4.1.bb     | 19 -------------------
 4 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 packages/gnome/libsoup-2.4_2.4.1.bb
 delete mode 100644 packages/gnome/libsoup_2.4.1.bb

(limited to 'packages')

diff --git a/packages/gnome/epiphany_2.22.1.bb b/packages/gnome/epiphany_2.22.1.bb
index 82f158eae2..d2d45475b7 100644
--- a/packages/gnome/epiphany_2.22.1.bb
+++ b/packages/gnome/epiphany_2.22.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "GNOME default webbrowser"
-DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
 RDEPENDS = "gnome-vfs-plugin-http"
 
 inherit gnome
diff --git a/packages/gnome/libsoup-2.4_2.4.1.bb b/packages/gnome/libsoup-2.4_2.4.1.bb
new file mode 100644
index 0000000000..24de169e6f
--- /dev/null
+++ b/packages/gnome/libsoup-2.4_2.4.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "An HTTP library implementation in C"
+SECTION = "x11/gnome/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gnutls libxml2"
+
+PR = "r1"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/libsoup-${PV}.tar.bz2"
+S = "${WORKDIR}/libsoup-${PV}"
+
+inherit autotools
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb
index 0193f91521..d69a985627 100644
--- a/packages/gnome/libsoup_2.2.100.bb
+++ b/packages/gnome/libsoup_2.2.100.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "An HTTP library implementation in C"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
 
+PR = "r1"
+
 DEPENDS = "glib-2.0 gnutls libxml2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
+inherit autotools 
 
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev = "${includedir}/ ${libdir}/"
@@ -16,5 +18,4 @@ AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
 do_stage() {
 	autotools_stage_all
-	ln -sf libsoup-2.2.pc ${PKG_CONFIG_DIR}/libsoup.pc
 }
diff --git a/packages/gnome/libsoup_2.4.1.bb b/packages/gnome/libsoup_2.4.1.bb
deleted file mode 100644
index 42e5decb05..0000000000
--- a/packages/gnome/libsoup_2.4.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-DESCRIPTION = "An HTTP library implementation in C"
-SECTION = "x11/gnome/libs"
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 gnutls libxml2"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
-        autotools_stage_all
-        cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.4.pc
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir}/ ${libdir}/"
-FILES_${PN}-doc = "${datadir}/"
-- 
cgit v1.2.3