After discussed on IRC, I'm ok with the patch. Thanks for the clarification.
Some comments about "without_moz_nss_nspr" might help understand the
spec, since it has different meaning from the one in firefox.spec.
Thanks,
-Evan
Alfred Peng wrote:
> Hi Evan,
>
> Evan Yan wrote:
>
>> Alfred,
>>
>> Alfred Peng wrote:
>>
>>
>>> Hi Evan,
>>>
>>> Thanks for the review.
>>>
>>> Evan Yan wrote:
>>>
>>>
>>>
>>>> Hi Alfred,
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>> +%if %without_moz_nss_nspr
>>>>> +# owner:davelam date:2006-01-13 type:branding
>>>>> +# let Songbird use system bundled nss,nspr
>>>>>
>>>>>
>>>>>
>>>>>
>>>> You forgot to change the owner and date
>>>>
>>>>
>>>>
>>>>
>>> I just copy the patch from Firefox and didn't change it. Should I update
>>> the owner and date?
>>>
>>>
>>>
>> If the two patches are the same, maybe you should make the two spec-file
>> share the same one, other than duplicated ones. That makes it easy to
>> maintain.
>>
>>
> Songbird and Firefox are in different spec repository. Songbird is in
> spec-files-other. Could they share the same one in this case?
>
>> If you think a copy works better, I think at least the date should be
>> updated. And make sure the original owner (Dave) aware of it.
>>
> I'll update the date. CC Dave in this.
>
>>>>> %if %without_moz_nss_nspr
>>>>> +Requires: SUNWpr
>>>>>
>>>>> +#FIXME: remove this after the system nss/nspr libraries are upgraded.
>>>>> +Requires: SUNWfirefox
>>>>> +%endif
>>>>>
>>>>>
>>>>>
>>>>>
>>>> I guess you mean
>>>> %else
>>>> Requires: SUNWfirefox
>>>>
>>>>
>>>>
>>>>
>>> "without_moz_nss_nspr" means to use the system nss/nspr. Before they are
>>> upgraded to the minimal requirement, Songbird will depend on Firefox's.
>>>
>>>
>>>
>> When using "without_moz_nss_nspr", Songbird doesn't need to depend on
>> Firefox, right?
>>
>>
> There might be some mis-understanding. When using
> "without_moz_nss_nspr", it means Songbird won't use Mozilla's own
> nss/nspr and it'll depend on Firefox's copy.
>
>>>>> +%if %without_moz_nss_nspr
>>>>> +LDFLAGS="$LDFLAGS -R%{_libdir}/firefox"
>>>>> +%endif
>>>>> +export LDFLAGS
>>>>>
>>>>>
>>>>>
>>>>>
>>>> %else is also missed here.
>>>>
>>>>
>>>>
>>>>
>>> This part will be updated to "-R%{_libdir}/mps" when the system
>>> libraries are upgraded.
>>>
>>>
>>>
>> When using "without_moz_nss_nspr", we're using the system nss/nspr
>> (implies that the system libraries are upgraded) and we need
>> "-R%{_libdir}/mps".
>> When NOT using "without_moz_nss_nspr", we're using firefox's nss/nspr
>> and we need "-R%{_libdir}/firefox".
>>
>> Just like what's in firefox.spec
>>
>> %if %without_moz_nss_nspr
>> %define nss_nspr_dir %{_libdir}/mps
>> %else
>> %define nss_nspr_dir %{_libdir}/%{name}
>> %endif
>>
>>
> Since "$ORIGIN" has been included in Songbird's LDFLAGS, "%else" might
> not be necessary. What's your opinion?
>
> Thanks,
> -Alfred
>
>> -Evan
>>
>>
>>
>>> Thanks,
>>> -Alfred
>>>
>>>
>>>
>>>> -Evan
>>>>
>>>>
>>>> Alfred Peng wrote:
>>>>
>>>>
>>>>
>>>>
>>>>> Hi guys,
>>>>>
>>>>> One of the ARC opinions for Songbird is to make it to depend on
>>>>> Firefox's nss/nspr for now. When the system nss/nspr are upgraded to the
>>>>> minimal requirement, Songbird will depend on the system ones.
>>>>>
>>>>> Attached are the patches to address this issue which derives from
>>>>> Firefox's spec.
>>>>>
>>>>> Thanks,
>>>>> -Alfred
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>
>>>
>>>
>
>