[Freeipa-devel] [PATCH] 0081 Support both unified samba and samba/samba4-packages

[Alexander Bokovoy]

On Mon, 01 Oct 2012, Martin Kosek wrote:
>On 10/01/2012 04:35 PM, Alexander Bokovoy wrote:
>> On Mon, 01 Oct 2012, Martin Kosek wrote:
>>> On 10/01/2012 11:24 AM, Alexander Bokovoy wrote:
>>>> Hi,
>>>>
>>>> The patch attached fixes Fedora build system issue with unified samba
>>>> package (samba/samba4 packages got merged in Fedora 18 and Rawhide
>>>> recently) since we depend on a wbclient.h header file path to which
>>>> included versioned directory name previously (samba-4.0/ vs samba/).
>>>>
>>>
>>> I am not convinced this is a correct approach, this was failing on my Fedora 18
>>> instance anyway:
>>>
>>> # make rpms
>>> ...
>>> checking for NDR... yes
>>> checking for SAMBAUTIL... yes
>>> checking for samba-4.0/wbclient.h... no
>>> checking for samba/wbclient.h... no
>>> configure: error: samba/wbclient.h not found
>>> make: *** [bootstrap-autogen] Error 1
>>>
>>> The problem was that samba-devel package is no longer providing wbclient.h
>>> header file:
>>>
>>> # rpm -qR samba-devel-4.0.0-150.fc18.rc1.x86_64 | grep wbclient.h
>>> #
>>>
>>> I had a discussion with Andreas (CC-ed), the root cause was a missing
>>> libwbclient-devel package which is the new provider of the samba-4.0/wbclient.h
>>> file. He was also not aware of /usr/include/samba-4.0/ -> /usr/include/samba/
>>> change.
>>>
>>> I created a new patch with recommended approach (attached). Could you please
>>> check if it is OK? It worked for me on both Fedora 17 and 18.
>> ACK for your patch except one change:
>>
>>> @@ -214,10 +220,16 @@ Summary: Virtual package to install packages required
>>> for Active Directory trust
>>> Group: System Environment/Base
>>> Requires: %{name}-server = %version-%release
>>> Requires: python-crypto
>>> +%if 0%{?fedora} >= 18
>>> +Requires: samba-python
>>> +Requires: samba
>>> +Requires: samba-winbind
>>> +%else
>>> Requires: samba4-python
>>> Requires: samba4
>>> -Requires: libsss_idmap
>> Why libsss_idmap is removed? I'd assume this is a mistake.
>>
>
>I just moved it to the end of the Requires list so that I can group samba
>Fedora-version-dependent Requires together:
>
>...
>+%else
> Requires: samba4-python
> Requires: samba4
>-Requires: libsss_idmap
> Requires: samba4-winbind
>+%endif
>+Requires: libsss_idmap       <<<<<
:) Thanks.
I was not looking properly.

ACK
-- 
/ Alexander Bokovoy