[oe-commits] Saul Wold : avahi: Update to 0.6.31

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: b535d953b08c54411a998e7527b4c2323720fcbf
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b535d953b08c54411a998e7527b4c2323720fcbf

Author: Saul Wold <sgw at linux.intel.com>
Date:   Tue Mar 13 14:47:42 2012 -0700

avahi: Update to 0.6.31

Removed unneeded patch, because the issue was fixed upstream

Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../{avahi-ui_0.6.30.bb => avahi-ui_0.6.31.bb}     |    8 ++++----
 meta/recipes-connectivity/avahi/avahi.inc          |    6 +++---
 .../avahi/{avahi_0.6.30.bb => avahi_0.6.31.bb}     |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
similarity index 93%
rename from meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
rename to meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
index d7b9ed8..2c12053 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
@@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 require avahi.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
+SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
 
 DEPENDS += "avahi gtk+ libglade"
 
@@ -34,9 +37,6 @@ RDEPENDS_avahi-discover = "python-avahi python-pygtk"
 RDEPENDS_python-avahi = "python-dbus"
 
 
-SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
-SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
-
 do_install_append () {
 	rm ${D}${sysconfdir} -rf
 	rm ${D}${base_libdir} -rf
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5e29b9c..0308095 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,15 +14,14 @@ SECTION = "network"
 # python scripts are under GPLv2+
 LICENSE = "GPLv2+ & LGPLv2.1+"
 
-INC_PR = "r11"
+INC_PR = "r0"
 
 DEPENDS = "expat libcap libdaemon dbus glib-2.0"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
           file://00avahi-autoipd \
           file://99avahi-autoipd \
-          file://initscript.patch \
-          file://fix_for_automake_1.11.2.patch"
+          file://initscript.patch" 
 
 USERADD_PACKAGES = "avahi-daemon"
 USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
@@ -113,6 +112,7 @@ do_install() {
 	# if /var/run become non-empty in the future, need to install it via volatile
 	rm -rf ${D}/var/run
 	rm -rf ${D}${datadir}/dbus-1/interfaces
+	rm -rf ${D}/usr/lib/avahi
 }
 
 do_install_avahi-autoipd() {
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
similarity index 80%
rename from meta/recipes-connectivity/avahi/avahi_0.6.30.bb
rename to meta/recipes-connectivity/avahi/avahi_0.6.31.bb
index 692a5df..e56bb1d 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 PR = "${INC_PR}.0"
 
+SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
+SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
+
 DEPENDS += "intltool-native"
 
 PACKAGES =+ "libavahi-gobject"
-
-SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
-SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"