From nobody Fri May 17 07:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1618478435; cv=none; d=zohomail.com; s=zohoarc; b=it4TsEH+329jsvNChZgJk235FM+6NaCSWhzx2LsKPDaUZ98wACQ1cb769Q+uX1m0Nmj706Lbz1MHnK9o3m0hHqMRALez+9ZWEmra4HnIoxdvERKFhFbbcyfsHAiLQDeEwYCeTLykni+Yqzp7jZ4C+uhot/5CvmwQFnAYpwfDLoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618478435; 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=cPrqNF1WuqbjtaEKs3Cu6x1sjxnCOce7QYdDkhYURd8=; b=KHILb/kqnQeeuTFwASR4eR6dZcolJTW3DAuacZzuf8kR4RqhlpgfJ4hQJ7v9jeR0i1ijOEVCDCKYhT8Kgl36CzZXspbD/Wd4+LG33cUzF/RW5C98Cuzdz6SeOty0/r08ReEezHozL2qz1Hkn0uiEJSEyzYKStFR/Rx1kxFD0rWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1618478435231280.2288733066313; Thu, 15 Apr 2021 02:20:35 -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-301-vDi7vqpVNH25C543cs1AGw-1; Thu, 15 Apr 2021 05:20:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D64984B9A0; Thu, 15 Apr 2021 09:20:25 +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 3417D50D38; Thu, 15 Apr 2021 09:20:24 +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 65ADF44A5B; Thu, 15 Apr 2021 09:20:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13F9KM08024617 for ; Thu, 15 Apr 2021 05:20:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3BD7E5D9DE; Thu, 15 Apr 2021 09:20:22 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.176]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 49C2D5D9DC for ; Thu, 15 Apr 2021 09:20:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618478434; 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=cPrqNF1WuqbjtaEKs3Cu6x1sjxnCOce7QYdDkhYURd8=; b=bRXpo8joberWpsiPq7zyEjp2l2g7LhZfKJqaF6cEljRSyccucZolSSuOfz/qFR4/0dqS5g kaoC31s253CCb+Licrmry7H+th6zWo33Efvq/uoD/U+ZCv97a4XIv+RgOVjEeASHL9ZAiV 24yXg7FSK9GQn7VeDSzWj9ByiD/nUY4= X-MC-Unique: vDi7vqpVNH25C543cs1AGw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] spec: Merge -bash-completion and -admin into -client Date: Thu, 15 Apr 2021 11:20:14 +0200 Message-Id: <20210415092014.820219-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.79 on 10.5.11.13 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 --- libvirt.spec.in | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f9af330186..80a12a307a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -901,7 +901,6 @@ Requires: %{name}-libs =3D %{version}-%{release} Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils -Requires: %{name}-bash-completion =3D %{version}-%{release} =20 %description client The client binaries needed to access the virtualization @@ -918,20 +917,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 +1857,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 +1873,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 +1899,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