Update and lock OHM down to a working revision, also remove some crack

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2685 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 12 insertions, 16 deletions

diff --git a/meta/packages/ohm/ohm_git.bb b/meta/packages/ohm/ohm_git.bb
index ae338bf2da..9cdea709cf 100644
--- a/meta/packages/ohm/ohm_git.bb
+++ b/meta/packages/ohm/ohm_git.bb
@@ -7,20 +7,19 @@ RDEPENDS_${PN} += "udev hal-info"
 SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git"
 
 PV = "0.0+git${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-distro=debian --disable-gtk-doc --with-xauth-dir=/home/root"
+EXTRA_OECONF = "--with-distro=debian \
+        --with-xauth-dir=/home/root \
+        --disable-gtk-doc \
+        --disable-docbook-docs"
 
 do_configure_prepend() {
-        touch gtk-doc.make
-}
-
-do_configure_append() {
-        rm config.log
+        touch gtk-doc.make
 }
 
 OE_LT_RPATH_ALLOW=":${libdir}/libohm:"
@@ -28,20 +27,17 @@ OE_LT_RPATH_ALLOW[export]="1"
 
 PACKAGES =+ "libohm ohm-plugin-x11"
 
-FILES_${PN}-dev += "${libdir}/ohm/*.la \
-                   ${libdir}/ohm/*.a "
+FILES_${PN}-dev += "${libdir}/ohm/*.a"
 
 FILES_${PN} = "${sysconfdir} \
                ${bindir}/* \
-               ${sbindir}/* \
-               ${libdir}/ohm/*.so \
-               "
+               ${sbindir}/* \
+               ${libdir}/ohm/*.so \
+               "
 
 FILES_libohm = "${libdir}/libohm.so.*"
 FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \
                         ${libdir}/ohm/libohm_idle.so \ 
                         ${sysconfdir}/ohm/plugins.d/x* \
-                        ${sysconfdir}/ohm/plugins.d/idle* \
-                        "
-
-
+                        ${sysconfdir}/ohm/plugins.d/idle* \
+                        "