[csw-devel] SF.net SVN: gar:[14754] csw/mgar/pkg/clamav/trunk

[bonivart at users.sourceforge.net]

Revision: 14754
          http://gar.svn.sourceforge.net/gar/?rev=14754&view=rev
Author:   bonivart
Date:     2011-06-09 09:33:26 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
clamav/trunk: update to 0.97.1

Modified Paths:
--------------
    csw/mgar/pkg/clamav/trunk/Makefile
    csw/mgar/pkg/clamav/trunk/checksums

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2011-06-09 01:14:26 UTC (rev 14753)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2011-06-09 09:33:26 UTC (rev 14754)
@@ -1,5 +1,5 @@
 NAME = clamav
-VERSION = 0.97
+VERSION = 0.97.1
 #VERSION = 0.97rc
 #DISTNAME = $(NAME)-devel-latest
 CATEGORIES = apps
@@ -37,7 +37,7 @@
 CATALOGNAME_CSWlibclam6-dev = libclam6_dev
 SPKG_DESC_CSWlibclam6-dev = $(DESCRIPTION) Development
 RUNTIME_DEP_PKGS_CSWlibclam6-dev = CSWlibclam6
-INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel
+INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel CSWlibclamav6-devel
 
 PATCHFILES  = CSWclamav.freshclam.conf.p
 PATCHFILES += CSWclamav.clamd.conf.p
@@ -103,10 +103,19 @@
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node56.html
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node24.html
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node15.html
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.9|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.9|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
-CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.9|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
 
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.10|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.10|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
+CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.10|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
+
+# Should only be necessary during transition of devel -> dev
+CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamunrar.so|CSWlibclam6-dev|CSWlibclam6-devel
+CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/bin/clamav-config|CSWlibclam6-dev|CSWlibclam6-devel
+CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamunrar_iface.so|CSWlibclam6-dev|CSWlibclam6-devel
+CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/include/clamav.h|CSWlibclam6-dev|CSWlibclam6-devel
+CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/pkgconfig/libclamav.pc|CSWlibclam6-dev|CSWlibclam6-devel
+CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamav.so|CSWlibclam6-dev|CSWlibclam6-devel
+
 include gar/category.mk
 
 DOCS  = AUTHORS BUGS ChangeLog

Modified: csw/mgar/pkg/clamav/trunk/checksums
===================================================================
--- csw/mgar/pkg/clamav/trunk/checksums	2011-06-09 01:14:26 UTC (rev 14753)
+++ csw/mgar/pkg/clamav/trunk/checksums	2011-06-09 09:33:26 UTC (rev 14754)
@@ -1 +1 @@
-605ed132b2f8e89df11064adea2b183b  clamav-0.97.tar.gz
+4f3fb74ff1098c25eef8e10721478c29  clamav-0.97.1.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.