libgpepimc: correctly install libgpepimc.pc file

* by removing now superfluous custom do_install task
* fix build of libtododb and libcontactsdb
* bump PR

Acked-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>

diff --git a/recipes/libgpepimc/libgpepimc.inc b/recipes/libgpepimc/libgpepimc.inc
index ec775df..fdf6591 100644 (file)
--- a/recipes/libgpepimc/libgpepimc.inc
+++ b/recipes/libgpepimc/libgpepimc.inc
@@ -10,12 +10,12 @@ SRC_URI = "${GPE_MIRROR}/libgpepimc-${PV}.tar.bz2"
 
 inherit pkgconfig autotools
 
-headers = "pim-categories.h pim-categories-ui.h"
+#headers = "pim-categories.h pim-categories-ui.h"
 
-do_install () {
-        oe_libinstall -so libgpepimc ${D}${libdir}
-        install -d ${D}${includedir}/gpe
-        for h in ${headers}; do
-                install -m 0644 ${S}/gpe/$h ${D}${includedir}/gpe/$h
-        done
-}
+#do_install () {
+#        oe_libinstall -so libgpepimc ${D}${libdir}
+#        install -d ${D}${includedir}/gpe
+#        for h in ${headers}; do
+#                install -m 0644 ${S}/gpe/$h ${D}${includedir}/gpe/$h
+#        done
+#}

diff --git a/recipes/libgpepimc/libgpepimc_0.9.bb b/recipes/libgpepimc/libgpepimc_0.9.bb
index 0ca2832..688b850 100644 (file)
--- a/recipes/libgpepimc/libgpepimc_0.9.bb
+++ b/recipes/libgpepimc/libgpepimc_0.9.bb
@@ -1,5 +1,5 @@
 require libgpepimc.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " file://get-category-by-name.patch"
 

diff --git a/recipes/libgpepimc/libgpepimc_svn.bb b/recipes/libgpepimc/libgpepimc_svn.bb
index 621ac39..45d30f5 100644 (file)
--- a/recipes/libgpepimc/libgpepimc_svn.bb
+++ b/recipes/libgpepimc/libgpepimc_svn.bb
@@ -6,7 +6,7 @@ DEPENDS = "libgpewidget gtk+ sqlite"
 PROVIDES = "libgepepimc"
 RPROVIDES_${PN} = "libgepepimc"
 PV = "0.8+svn${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GPE_SVN}"
 
@@ -16,12 +16,4 @@ inherit pkgconfig autotools
 
 headers = "pim-categories.h pim-categories-ui.h"
 
-do_install () {
-        oe_libinstall -so libgpepimc ${D}${libdir}
-        install -d ${D}${includedir}/gpe
-        for h in ${headers}; do
-                install -m 0644 ${S}/gpe/$h ${D}${includedir}/gpe/$h
-        done
-}
-
 DEFAULT_PREFERENCE = "-1"