From 6bf99a5ba5ea856bc18a452608ae7ca767e2bf5e Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 28 Jan 2011 20:12:36 +0000 Subject: wireshark: fix RDEPENDS version syntax Signed-off-by: Andreas Oberritter --- recipes/wireshark/wireshark_1.2.6.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes/wireshark') diff --git a/recipes/wireshark/wireshark_1.2.6.bb b/recipes/wireshark/wireshark_1.2.6.bb index 610db05e02..cbd9c6065d 100644 --- a/recipes/wireshark/wireshark_1.2.6.bb +++ b/recipes/wireshark/wireshark_1.2.6.bb @@ -29,10 +29,10 @@ FILES_${PN}-tshark = "${bindir}/tshark" FILES_${PN}-tshark-dbg = "${bindir}/.debug/tshark" RDEPENDS_${PN}-tshark += "libsmi-mibs libsmi-pibs ${PN}-data" RDEPENDS_${PN}-wireshark += "libsmi-mibs libsmi-pibs ${PN}-data" -RCONFLICTS_${PN}-tshark = "tshark wireshark (<1.0.5)" -RREPLACES_${PN}-tshark = "tshark wireshark (<1.0.5)" -RCONFLICTS_${PN}-wireshark = "tshark wireshark (<1.0.5)" -RREPLACES_${PN}-wireshark = "tshark wireshark (<1.0.5)" +RCONFLICTS_${PN}-tshark = "tshark wireshark (<= 1.0.5)" +RREPLACES_${PN}-tshark = "tshark wireshark (<= 1.0.5)" +RCONFLICTS_${PN}-wireshark = "tshark wireshark (<= 1.0.5)" +RREPLACES_${PN}-wireshark = "tshark wireshark (<= 1.0.5)" PACKAGES += "${PN}-plugins-dbg ${PN}-plugins" FILES_${PN}-plugins = "${libdir}/wireshark/plugins/${PV}/*.so ${libdir}/wireshark/plugins/${PV}/*.la" @@ -54,8 +54,8 @@ FILES_${PN}-dev = "" FILES_${PN}-dbg = "" ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} = "${PN}-tshark ${PN}-wireshark ${PN}-plugins ${PN}-data" -RCONFLICTS_${PN} = "tshark wireshark (<1.0.5)" -RREPLACES_${PN} = "tshark wireshark (<1.0.5)" +RCONFLICTS_${PN} = "tshark wireshark (<= 1.0.5)" +RREPLACES_${PN} = "tshark wireshark (<= 1.0.5)" inherit autotools -- cgit 1.2.3-korg