[libvirt] [PATCH] spec: Temporarily disable new admin-related files

[Martin Kletzander]

On Tue, Dec 01, 2015 at 11:36:10AM +0100, Michal Privoznik wrote:
>On 01.12.2015 11:09, Martin Kletzander wrote:
>> The virt-admin binary and its man page should not yet be distributed,
>> but we need libvirt-common.h.  RPM build fails without specifying these.
>>
>> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
>> ---
>>  libvirt.spec.in | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/libvirt.spec.in b/libvirt.spec.in
>> index 8420d1107ca8..9db550c2a0db 100644
>> --- a/libvirt.spec.in
>> +++ b/libvirt.spec.in
>> @@ -1565,8 +1565,10 @@ mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \
>>     $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.so
>>  %endif
>>
>> -# Temporarily get rid of not-installed libvirt-admin.so
>> +# Temporarily get rid of not-installed admin-related files
>>  rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-admin.so
>> +rm -f $RPM_BUILD_ROOT%{_bindir}/virt-admin
>> +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virsh.1*
>>

Of course this should've been virt-admin and not virsh, but we just
forgot to mention in in the list, so for the sake of completeness...

>>  %if %{with_network}
>>  install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
>> @@ -2320,6 +2322,7 @@ exit 0
>>  %dir %{_includedir}/libvirt
>>  %{_includedir}/libvirt/virterror.h
>>  %{_includedir}/libvirt/libvirt.h
>> +%{_includedir}/libvirt/libvirt-common.h
>>  %{_includedir}/libvirt/libvirt-domain.h
>>  %{_includedir}/libvirt/libvirt-domain-snapshot.h
>>  %{_includedir}/libvirt/libvirt-event.h
>>
>
>ACK
>
>Michal

Thanks, pushed now.

Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20151201/9da56cdb/attachment-0001.sig>