[csw-devel] SF.net SVN: gar:[15805] csw/mgar/pkg/libldns/trunk/Makefile
Maciej (Matchek) Bliziński
maciej at opencsw.org
Fri Sep 30 11:09:48 CEST 2011
2011/9/30 <idogan23 at users.sourceforge.net>:
> Revision: 15805
> http://gar.svn.sourceforge.net/gar/?rev=15805&view=rev
> Author: idogan23
> Date: 2011-09-30 08:58:33 +0000 (Fri, 30 Sep 2011)
> Log Message:
> -----------
> liblnds: fixed overrides
>
> Modified Paths:
> --------------
> csw/mgar/pkg/libldns/trunk/Makefile
>
> Modified: csw/mgar/pkg/libldns/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/libldns/trunk/Makefile 2011-09-29 22:13:48 UTC (rev 15804)
> +++ csw/mgar/pkg/libldns/trunk/Makefile 2011-09-30 08:58:33 UTC (rev 15805)
> @@ -544,7 +544,7 @@
> CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/sparcv8plus+vis/libldns.so|CSWlibldns-devel|CSWlibldnsdevel
> CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_rr_new_frm_type.3|CSWlibldns-devel|CSWlibldnsdevel
> CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/share/man/man3/ldns_dnssec_derive_trust_tree_normal_rrset.3|CSWlibldns-devel|CSWlibldnsdevel
> -#CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/amd64/libldns.so|CSWlibldns-devel|CSWlibldnsdevel
> -#CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/pentium_pro/libldns.so|CSWlibldns-devel|CSWlibldnsdevel
> +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/amd64/libldns.so|CSWlibldns-devel|CSWlibldnsdevel
> +CHECKPKG_OVERRIDES_CSWlibldns-devel += file-collision|/opt/csw/lib/pentium_pro/libldns.so|CSWlibldns-devel|CSWlibldnsdevel
Is there a reason to keep conflicting files in the repository?
This would probably fix the problem:
OBSOLETED_BY_CSWlibldns-devel = CSWlibldnsdevel
More information about the devel
mailing list