5 files changed, 11 insertions, 2 deletions
diff --git a/recipes/clamav/clamav.inc b/recipes/clamav/clamav.inc
index 49b8023a53..5b2069e739 100644
--- a/recipes/clamav/clamav.inc
+++ b/recipes/clamav/clamav.inc
@@ -19,7 +19,6 @@ RRECOMMENDS_${PN}-daemon = "${PN}-freshclam"
 RPROVIDES_${PN}-freshclam = "${PN}-data"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \
-          file://cross-compile-fix.patch;patch=1 \
           file://clamav-daemon.init \
           file://clamav-freshclam.init \
           file://clamd.conf \
@@ -67,10 +66,11 @@ do_stage () {
 PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib \
              ${PN}-clamconf"
 
+LEAD_SONAME = "libclamav.so.*"
 FILES_${PN} = "${bindir}/clamscan \
                ${bindir}/sigtool \
                ${bindir}/clamdscan"
-FILES_${PN}-lib = "${libdir}/libclamav.so.*"
+FILES_${PN}-lib = "${libdir}/libclamav.so.* ${libdir}/libclamunrar.so* ${libdir}/libclamunrar_iface.so*"
 FILES_${PN}-conf = "${sysconfdir}/clamd.conf"
 FILES_${PN}-clamconf = "${bindir}/clamconf"
 FILES_${PN}-freshclam = "${bindir}/freshclam \
diff --git a/recipes/clamav/clamav_0.90.2.bb b/recipes/clamav/clamav_0.90.2.bb
index 9592adf914..740c02a90e 100644
--- a/recipes/clamav/clamav_0.90.2.bb
+++ b/recipes/clamav/clamav_0.90.2.bb
@@ -1,3 +1,5 @@
 require clamav.inc
 
+SRC_URI += "file://cross-compile-fix.patch;patch=1"
+
 PR = "r2"
diff --git a/recipes/clamav/clamav_0.90.3.bb b/recipes/clamav/clamav_0.90.3.bb
index e721558efe..2227f01f07 100644
--- a/recipes/clamav/clamav_0.90.3.bb
+++ b/recipes/clamav/clamav_0.90.3.bb
@@ -1,3 +1,5 @@
 require clamav.inc
 
+SRC_URI += "file://cross-compile-fix.patch;patch=1"
+
 PR = "r1"
diff --git a/recipes/clamav/clamav_0.91.1.bb b/recipes/clamav/clamav_0.91.1.bb
index e721558efe..2227f01f07 100644
--- a/recipes/clamav/clamav_0.91.1.bb
+++ b/recipes/clamav/clamav_0.91.1.bb
@@ -1,3 +1,5 @@
 require clamav.inc
 
+SRC_URI += "file://cross-compile-fix.patch;patch=1"
+
 PR = "r1"
diff --git a/recipes/clamav/clamav_0.94.2.bb b/recipes/clamav/clamav_0.94.2.bb
new file mode 100644
index 0000000000..12fad7afab
--- /dev/null
+++ b/recipes/clamav/clamav_0.94.2.bb
@@ -0,0 +1,3 @@
+require clamav.inc
+
+EXTRA_OECONF += "--program-transform-name=''"