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

[Dagobert Michelsen]

Hi Ihsan,

Am 30.09.2011 um 11:09 schrieb Maciej (Matchek) Bliziński:
> 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

The new standard is actually
  CSWlibldns-dev and libldns_dev

For the obsoletion you also need
  CATALOGNAME_CSWlibldnsdevel = libldns_devel_stub
as the catalog name was actually different from the package name.


Best regards

  -- Dago

-- 
"You don't become great by trying to be great, you become great by wanting to do something,
and then doing it so hard that you become great in the process." - xkcd #896