From nobody Mon Feb 9 06:48:13 2026 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=1618921874; cv=none; d=zohomail.com; s=zohoarc; b=ivcHUcqRPLF3P8gv3YWfizokCP2rvWavtb/xpdWZ2M6W/ZZcczCXDECVYWNaGLF+WLbWgTYdggnfJbjkontW/NsnWaN4zimFWmCgpAgvNYYV0bIJhxEbr0/4t26O6I2quh4wejBBkhYhkvBoch/gx5WlLH5JoT+iRWCpiRh8kAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618921874; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=te2WAW2e51MHuhJkQu8SNmZ3+xU7lGLOSjV1w/qEjIc=; b=Ev83CPxVfHxdoPGVRPBakeA/Dv5iwjoVgBSFuFzgT4SrShNVETYmxJwX6BfspYjTolL4FH5kuMj8Es+MqyNGtrmesSpJSa335RVAa+vCfHaDdGRb60fnWjpBNgBWW63zmRokirYtBMumQJFbTP6ybQfX81el52wK7AktX0QAhoc= 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 1618921874754275.2722713707627; Tue, 20 Apr 2021 05:31:14 -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-13-yr-RdzhcNfekXzx9qLM4yQ-1; Tue, 20 Apr 2021 08:31:10 -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 C27361008079; Tue, 20 Apr 2021 12:31:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 962DF107D5C4; Tue, 20 Apr 2021 12:31:03 +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 591A61806D1D; Tue, 20 Apr 2021 12:31:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13KCV1Wr025290 for ; Tue, 20 Apr 2021 08:31:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3D160BA6F; Tue, 20 Apr 2021 12:31:01 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.191]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 52D77610F3 for ; Tue, 20 Apr 2021 12:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618921873; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=te2WAW2e51MHuhJkQu8SNmZ3+xU7lGLOSjV1w/qEjIc=; b=F2+L5c/z/ZxePrAjrl4T6qaBXgcnNfKEZWWZatz+1GcTrGGPxin0NqMivXNIj2qWP3KWMy 33bWgnmFWW7uqn3LXoElKZv4ezKlsotOevk/zA+SU/KknZVPxOMVQlNLmRlI0IFOUtRvwQ Xbqf2bii3Bw5IO3OHbgT2DlIVX/jffg= X-MC-Unique: yr-RdzhcNfekXzx9qLM4yQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 4/4] spec: Drop -bash-completion package Date: Tue, 20 Apr 2021 14:30:33 +0200 Message-Id: <20210420123033.471957-5-abologna@redhat.com> In-Reply-To: <20210420123033.471957-1-abologna@redhat.com> References: <20210420123033.471957-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 completion script is so tiny that it makes more sense to potentially have two copies of it on disk than for it to have its own package. Signed-off-by: Andrea Bolognani --- libvirt.spec.in | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0fec79c133..11abbb080e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -430,9 +430,6 @@ Summary: Server side daemon and supporting files for li= bvirt library # The client side, i.e. shared libs are in a subpackage Requires: %{name}-libs =3D %{version}-%{release} =20 -# bash completion support for virt-admin -Requires: %{name}-bash-completion =3D %{version}-%{release} - # (client invokes 'nc' against the UNIX socket on the server) Requires: /usr/bin/nc =20 @@ -469,6 +466,7 @@ Requires: gettext # Ensure smooth upgrades Obsoletes: libvirt-admin < 7.3.0 Provides: libvirt-admin +Obsoletes: libvirt-bash-completion < 7.3.0 =20 %description daemon Server side daemon required to manage the virtualization capabilities @@ -908,7 +906,9 @@ Summary: Client side utilities of the libvirt library Requires: %{name}-libs =3D %{version}-%{release} # Needed by virt-pki-validate script. Requires: gnutls-utils -Requires: %{name}-bash-completion =3D %{version}-%{release} + +# Ensure smooth upgrades +Obsoletes: libvirt-bash-completion < 7.3.0 =20 %description client The client binaries needed to access the virtualization @@ -925,12 +925,6 @@ Requires: cyrus-sasl-gssapi %description libs Shared libraries for accessing the libvirt daemon. =20 -%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 @@ -1296,6 +1290,17 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvi= rt_qemu_probes.stp \ %endif %endif =20 +# Turning these symlinks into regular files allows us to make the +# -client and -daemon packages, both of which need bash-completion +# support, completely independent by only paying a tiny price in +# terms of additional disk usage +for cmd in virsh virt-admin; do + rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd + cp $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh \ + $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd +done +rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh + %check # Building on slow archs, like emulated s390x in Fedora copr, requires # raising the test timeout @@ -1912,9 +1917,6 @@ exit 0 =20 %{_datadir}/libvirt/test-screenshot.png =20 -%files bash-completion -%{_datadir}/bash-completion/completions/vsh - %if %{with_wireshark} %files wireshark %{wireshark_plugindir}/libvirt.so --=20 2.26.3