From nobody Tue May 21 18:53:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618491167; cv=none; d=zohomail.com; s=zohoarc; b=QCul2vL+d6Sd1hmwQGoUUz7Xlq2iIryY18IZFWJWadVoYfs0L+V6mHjCc34JPAejXPcPwxjzTq1DqREAq/zYJhUO+fXukl3W0mnUu+vTVP7drokN07sx6mPF67p100T/pmF8kVTZxb+kFn8O5zPnIu6m3a9r2Cutj7fon9mVHvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618491167; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=B7ixVFYathFmfUufLltft+XBAfGv1YzMZ/3HuLyRNik=; b=V45YunNkw5Y8nhSqw9tlgsvvEgGbUjMPmrNFzVLVS9a0EDeczzOFA1jRXbkqFe/frMrsOobcq4uMeOgIsf6WWmikVRwqmIxtFrF8ai15ViVh3WxQXDcDGx37q/IyJFgRy+q2HJzLKKalan+ZgdCAI+Rt/NshTGwpHMWqAF/YzTA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1618491167747867.6453837270042; Thu, 15 Apr 2021 05:52:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-376-aUDIi5iUP8qClZVOAvvCiQ-1; Thu, 15 Apr 2021 08:52:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C03259F92A; Thu, 15 Apr 2021 12:52:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4920A10023B0; Thu, 15 Apr 2021 12:52:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9F0BC44A5B; Thu, 15 Apr 2021 12:52:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13FCqZMK014505 for ; Thu, 15 Apr 2021 08:52:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9754B10074FC; Thu, 15 Apr 2021 12:52:35 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA5E210074E1 for ; Thu, 15 Apr 2021 12:52:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618491165; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=B7ixVFYathFmfUufLltft+XBAfGv1YzMZ/3HuLyRNik=; b=NPMKWEwnUzjKC5kbL9NYFHHKkYO4DRUG2qm7JOqp/XOeDNXRsDy42moPvMrZp5YE1JqmlG uLxkt1HfHH22ZveZlfDsZQockxitSLSS+Krz99JTNkkmrr3KuEY6vEOJKn3zych/b1IHHf oL3MLZkHBoav7mDYQvp+WsQPojge0cw= X-MC-Unique: aUDIi5iUP8qClZVOAvvCiQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2] spec: Merge -bash-completion and -admin into -client Date: Thu, 15 Apr 2021 14:52:28 +0200 Message-Id: <20210415125228.24417-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The former is ridiculously tiny and doesn't have any use on its own, so it hardly warrants the overhead of an additional package; the latter is also very small and, just like virsh, is something that you likely want to have available on any virtualization host to help with management and debugging tasks. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- Changes from [v1]: * add Obsoletes/Provides for a smooth transition. [v1] https://listman.redhat.com/archives/libvir-list/2021-April/msg00604.ht= ml libvirt.spec.in | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f9af330186..a90f6abe38 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -901,7 +901,12 @@ Requires: %{name}-libs =3D %{version}-%{release} Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils -Requires: %{name}-bash-completion =3D %{version}-%{release} +# The -admin and -bash-completion packages have been merged into +# the -client package: ensure this change is handled smoothly +Obsoletes: libvirt-admin < 7.3.0 +Obsoletes: libvirt-bash-completion < 7.3.0 +Provides: libvirt-admin +Provides: libvirt-bash-completion =20 %description client The client binaries needed to access the virtualization @@ -918,20 +923,6 @@ Requires: cyrus-sasl-gssapi %description libs Shared libraries for accessing the libvirt daemon. =20 -%package admin -Summary: Set of tools to control libvirt daemon -Requires: %{name}-libs =3D %{version}-%{release} -Requires: %{name}-bash-completion =3D %{version}-%{release} - -%description admin -The client side utilities to control the libvirt daemon. - -%package bash-completion -Summary: Bash completion script - -%description bash-completion -Bash completion script stub. - %if %{with_wireshark} %package wireshark Summary: Wireshark dissector plugin for libvirt RPC transactions @@ -1872,10 +1863,12 @@ exit 0 =20 %files client %{_mandir}/man1/virsh.1* +%{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* %{_mandir}/man1/virt-host-validate.1* %{_bindir}/virsh +%{_bindir}/virt-admin %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-validate %{_bindir}/virt-host-validate @@ -1886,8 +1879,9 @@ exit 0 %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %endif =20 +%{_datadir}/bash-completion/completions/vsh %{_datadir}/bash-completion/completions/virsh - +%{_datadir}/bash-completion/completions/virt-admin =20 %{_unitdir}/libvirt-guests.service %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests @@ -1911,14 +1905,6 @@ exit 0 =20 %{_datadir}/libvirt/test-screenshot.png =20 -%files admin -%{_mandir}/man1/virt-admin.1* -%{_bindir}/virt-admin -%{_datadir}/bash-completion/completions/virt-admin - -%files bash-completion -%{_datadir}/bash-completion/completions/vsh - %if %{with_wireshark} %files wireshark %{wireshark_plugindir}/libvirt.so --=20 2.26.3