orbit2: upgrade to 2.14.12 to cope with glib >= 2.15

* restore sanity of .pc after do_install
* fix packaing

diff --git a/packages/gnome/orbit2-native_2.14.0.bb b/packages/gnome/orbit2-native_2.14.12.bb
similarity index 98%
rename from packages/gnome/orbit2-native_2.14.0.bb
rename to packages/gnome/orbit2-native_2.14.12.bb
index 2d52ab7..009974a 100644 (file)
--- a/packages/gnome/orbit2-native_2.14.0.bb
+++ b/packages/gnome/orbit2-native_2.14.12.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "CORBA ORB"
+PR = "r0"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \

diff --git a/packages/gnome/orbit2_2.14.0.bb b/packages/gnome/orbit2_2.14.12.bb
similarity index 79%
rename from packages/gnome/orbit2_2.14.0.bb
rename to packages/gnome/orbit2_2.14.12.bb
index 5ce381f..1ac0136 100644 (file)
--- a/packages/gnome/orbit2_2.14.0.bb
+++ b/packages/gnome/orbit2_2.14.12.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r2"
+PR = "r0"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
@@ -10,9 +10,13 @@ DEPENDS = "libidl popt orbit2-native gtk-doc"
 PARALLEL_MAKE = ""
 
 FILES_${PN} += "${libdir}/orbit-2.0/*.so"
+FILES_${PN}-dev += "${libdir}/orbit-2.0/*.a ${libdir}/orbit-2.0/*.la"
+FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug"
 
 S = "${WORKDIR}/ORBit2-${PV}"
 
+LEAD_SONAME = "libORBit-2.so"
+
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc"
@@ -25,8 +29,13 @@ do_configure_prepend() {
 }
 
 do_compile_append () {
-       sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
-       mv ORBit-2.0.pc.new ORBit-2.0.pc
+        cp ORBit-2.0.pc ORBit-2.0.pc.old
+        sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
+        mv ORBit-2.0.pc.new ORBit-2.0.pc
+}
+
+do_install_append () {
+        mv ORBit-2.0.pc.old ORBit-2.0.pc
 }
 
 do_stage() {