[csw-devel] SF.net SVN: gar:[14421] csw/mgar/pkg/libneon26/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 14421
          http://gar.svn.sourceforge.net/gar/?rev=14421&view=rev
Author:   dmichelsen
Date:     2011-04-27 15:29:03 +0000 (Wed, 27 Apr 2011)

Log Message:
-----------
libneon26: Fix problematic overrides

Modified Paths:
--------------
    csw/mgar/pkg/libneon26/trunk/Makefile

Modified: csw/mgar/pkg/libneon26/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libneon26/trunk/Makefile	2011-04-27 15:28:31 UTC (rev 14420)
+++ csw/mgar/pkg/libneon26/trunk/Makefile	2011-04-27 15:29:03 UTC (rev 14421)
@@ -29,6 +29,10 @@
 RUNTIME_DEP_PKGS_CSWlibneon26 += CSWzlib
 RUNTIME_DEP_PKGS_CSWlibneon26 += CSWlibintl8
 
+# These will go away later
+CHECKPKG_OVERRIDES_CSWlibneon26 += unidentified-dependency|CSWlibneon27
+CHECKPKG_OVERRIDES_CSWlibneon26 += file-collision|/opt/csw/lib/amd64/libneon.so.26|CSWlibneon26|CSWneon
+
 PACKAGES += CSWlibneon26-feature
 CATALOGNAME_CSWlibneon26_feature = libneon26_feature
 SPKG_DESC_CSWlibneon26-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.26
@@ -49,7 +53,7 @@
 # is obviously different from the soname in this case.
 CHECKPKG_OVERRIDES_CSWlibneon26-feature += soname-not-part-of-filename|soname=libneon.so.26|filename=libneon-feature.so.26.0.4
 CHECKPKG_OVERRIDES_CSWlibneon26-feature += soname-not-part-of-filename|soname=libneon.so.26|filename=libneon-feature.so.26.0.4
-CHECKPKG_OVERRIDES_CSWlibneon26-feature += shared-lib-pkgname-mismatch|sonames=libneon.so.26|pkgname=CSWlibneon26-feature|expected=CSWlibneon26|
+CHECKPKG_OVERRIDES_CSWlibneon26-feature += shared-lib-pkgname-mismatch
 
 # These will go away after release
 CHECKPKG_OVERRIDES_CSWlibneon26 += file-collision|/opt/csw/lib/libneon.so.26|CSWlibneon26|CSWneon


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