From nobody Sun Feb 8 12:31:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1670021966; cv=none; d=zohomail.com; s=zohoarc; b=jh9ebJ7z3Au3fl3U5kcSAsUt8mLqE6/7gjQHrb0AYLf1Xs0Jw13JhKIVBLQZqZCLll4+mmmbtpx+gO9o7nI0SIfTX2pTd2Q1ZN6huwERJ808XlNvPsYCdRbLq10woi3+pvPuT0mBzSXRn11z1aixSog/ruxlGemzK+JJIl2FOio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670021966; 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=j6M/KwmFir2T733YVpoqxa5WQpEKrzzzcgDa61YTpsQ=; b=XbH2wSI5tgv4EGqhPHnAwdOz7l+b3ZmUCzgYy7ufzxK0u1yvNShLAGxUM28ChI5jgUfwBEqCRYkIiS6zvrqJnOIZSSPhmjYwnfE/8hFx3qruRG+bGmMBNChW6MJP9I0VjN9B1bZ54YwJC4Qkhzdu1EkpWEVjCb/e/J+Aedo7GOY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1670021966948997.6297534443531; Fri, 2 Dec 2022 14:59:26 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-pguJivhVMXWQ9Af_0w_Mng-1; Fri, 02 Dec 2022 17:59:22 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B7C003804528; Fri, 2 Dec 2022 22:59:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB2CB492B06; Fri, 2 Dec 2022 22:59:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 57F27194658F; Fri, 2 Dec 2022 22:59:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3E2FB1946587 for ; Fri, 2 Dec 2022 22:59:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0EF83C19139; Fri, 2 Dec 2022 22:59:15 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 064F7C15BB4 for ; Fri, 2 Dec 2022 22:59:14 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D7D8D3804508 for ; Fri, 2 Dec 2022 22:59:14 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2052.outbound.protection.outlook.com [40.107.8.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-411-FYuBPmvoNWG05--zjFIRXA-1; Fri, 02 Dec 2022 17:59:12 -0500 Received: from AM6PR04MB4901.eurprd04.prod.outlook.com (2603:10a6:20b:1::32) by VI1PR04MB6846.eurprd04.prod.outlook.com (2603:10a6:803:12f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Fri, 2 Dec 2022 22:59:08 +0000 Received: from AM6PR04MB4901.eurprd04.prod.outlook.com ([fe80::78b2:ed7e:4e32:df8a]) by AM6PR04MB4901.eurprd04.prod.outlook.com ([fe80::78b2:ed7e:4e32:df8a%7]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 22:59:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670021965; 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=j6M/KwmFir2T733YVpoqxa5WQpEKrzzzcgDa61YTpsQ=; b=RBdAOpb6JTxjRCVrrulop6e+UyL+Jk/WzQzVcdhudQCwuaBjKSZpGpw4ycHkCO/PCCtH1A ZSp7gv8ezgu2c+QrOHO0HmDIs5xZwoqEpeWZGQLB7rz4ZQP9j/YEcG754fCv2/XHLSYJxj 5AHUVVCZjV1Qxgl7itKGUvHG2Q1z+74= X-MC-Unique: pguJivhVMXWQ9Af_0w_Mng-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: FYuBPmvoNWG05--zjFIRXA-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH] spec: Remove extra blank lines Date: Fri, 2 Dec 2022 15:59:04 -0700 Message-ID: <20221202225904.9423-1-jfehlig@suse.com> X-ClientProxiedBy: FR2P281CA0110.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9c::20) To AM6PR04MB4901.eurprd04.prod.outlook.com (2603:10a6:20b:1::32) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4901:EE_|VI1PR04MB6846:EE_ X-MS-Office365-Filtering-Correlation-Id: cd76bec0-6b11-43ec-198a-08dad4b8d1a0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: IUB7EgoAWUEP1CmeZrUpoCqUIpF7oVMLpk2R7cQbbdV6sXS++RknlFoUvMT1UGqXl7MsFX3Qfkv2GibQpvx4SCqvqGdp/Z2jIonhS7dWslELJzKz1gNiZlrNHDRUcHhndw5s9Keb6qBbkR7ntOmAYuvlG3ZxmBoLyVrWe470UeDc+15M5exxbW+FloLbtywjByvr2OBMysvBuA8cWGTKaAplCnQLQSiA4wmxBwFxwl5O5lqon/xvkJyJ6tsvglgsKVkuFPxJUtUysSkPv9YNlIybqgoBO+s+dq49cCvZpg2OAMZNLnpjFzWuOQLUkqJ5igYJLonVICPeCtGrCzMDUph7w153a8gY5Fiv060BRuOMoQ6tVqdg4WuCDtuagOf1IY9vD3xh7B5TFxjCqpoSQ7PVcfgFqO2q/pMjly5BJwnkwpawUCHUMbYexQcYxC5T0vhi1HXWUBJlhLrzN/nro+TDbf2MbIK5Hid6q+so8lp69+ltOOL+mBDx6UOieV7exIJX2MzByctScOBJkjPXnZ25I40nAxfkOWB2LH2UhFteAee46kf6J3JxVjQfwfzM+dFGnw0+EcyOf/frTNLabEGCxKHvA2HfNNmo9tdBI+jQj9c4INh9Zia3OXYO5sODjwCTJqUQz/lzHdHXEV8zUVcLKDyTTo1YqrR0QrmrQkIGO5eAWqGEs5Yxz4gvH2Y/ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB4901.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(366004)(346002)(39860400002)(396003)(136003)(376002)(451199015)(36756003)(38100700002)(2906002)(41300700001)(8936002)(5660300002)(30864003)(83380400001)(86362001)(66946007)(478600001)(66556008)(6486002)(66476007)(1076003)(2616005)(316002)(6916009)(6666004)(66574015)(6512007)(8676002)(6506007)(186003)(26005)(460985005); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Wx/oZb8niZez+MC9DQ9hSB0l9sh8yYW4C4/apvTt8wfdKd54ESVr27dF6PWz?= =?us-ascii?Q?YXshqk+JZP6EDKH0qw9nbZ9uonqcDyXMNNHIyBUzlOms3YirpjzZtz/EbhTa?= =?us-ascii?Q?EG/sYTFe+JhoNRgzZ/xG3d/vc1JR3Sy6q0tTRm10ZdWotIgItko0dCJrVJqe?= =?us-ascii?Q?6sU6d82MlVBosemkr/w15gRa3VfcRM93tVUT+x7ITBNzEXPqRi/j8plzQ3Ht?= =?us-ascii?Q?nQ/fSjqpFIqq/aVsvTkUCzt7UzZDQCxSjZ0lIXmAs98gFcKbYscDHirfMOnq?= =?us-ascii?Q?6Rp3Lff1REEo88A7GjW0CURX6nqZg7rXebOQYfb7GiScgy0amRBSFMPS129L?= =?us-ascii?Q?ZYv5fcMhLZhWBeJPnLqyjxoQZnwoVZZlcyQ4cR9iodmcuwBCDpaS5mzICvh+?= =?us-ascii?Q?q7gZueFLbP8yBZpZTvkDiULW8QJk9Rl9OegEXEAhCBUSysmBR8/UMUGoYOMO?= =?us-ascii?Q?goIeYsZTj5W0AXBE9bpGg7Bbbs6sX07MrDCtePbQfeC0ld5616B0s/en0rJj?= =?us-ascii?Q?/XcswYMrL5phEvDe5Ulh3jsnDFIJ9wzWB5jDsRiFF607TzI4QFl6IgvT377P?= =?us-ascii?Q?Yi8J5xVHAPpSkv9h266wSWPp1ZpDQK1+0Rux8p+CgrA+FY34OggXj5RAClKf?= =?us-ascii?Q?ZCoseb2Bxx15eCBoxm1DNXx7UVwVfG/zMLV1LEag8QgR8yIV+G5DsXZL+5Kb?= =?us-ascii?Q?4UUS1lHnXIykp0j3dMLtT+TqmiRc6JUkNw3ReW7t7FK9j0yUpjQN624kWMpG?= =?us-ascii?Q?ny0ZeYCHU/N/WqErOst8hfZ0LFeJwM3kGlulVWMfeq/yl0kP08aR2yU+niNs?= =?us-ascii?Q?qehqXYS2veva2XPP2kP4VjXgyvJa5csAld50jRh9Fq2Ub7awtH6A3slWuf40?= =?us-ascii?Q?K5PjgUojtVXWvjCQ0/uotefLvml1W6i3lGDWIcXK0y0x9uawWTfCwey7P1db?= =?us-ascii?Q?K3KhF0kFuB6jMH0i4mUM7JbZFslZpoXGn1UA3iHOwrh3jCMV6r9JTQFTR+kH?= =?us-ascii?Q?+sC0a9YbemG9pbn5+ZOx5cIupaYWW/EAF8Q1RDEyFTV52UT6XIP7r5Fa189y?= =?us-ascii?Q?5sph54G0jiffP/qLLeQ67yNrJTz68ycA036UaPfTz5ZkqkCjPCxiuWwstyTA?= =?us-ascii?Q?FoATWhJwFWn22mUs3FlvlgEyLiX5k4cggwpZbypI9BPR+6DrvvK8OnI73YUM?= =?us-ascii?Q?nFg8lTglwyNf0s3OCA2i0jXRnE1gazCtbkvOfV2aFsK3mvWV6cm8O9i7jKUK?= =?us-ascii?Q?d9DmnN8P6dpcgEHBWXrD1WSv+MQiTVMxOjMDRs83muFPruz6X3oVV5qVnn+k?= =?us-ascii?Q?iRyXiKgqrXrpTmuS3MnitNXVMYiHKxwjpRj52kduzBDxiZGq9Qf79iC2j4Ey?= =?us-ascii?Q?KGwb4d/S0w/nHbkpENxMS189ucO1d2HCeNkhlylxSLTBZ3BmeLYz2gfL2Kzl?= =?us-ascii?Q?CZ/5H+gjx9Y3vuf9kNQSblhsVzOfTuO0TJePU/qQy6Da0YuTFhp86LxGmiQU?= =?us-ascii?Q?jBb7NiUUnc+6iQJZ8onIeV6/rRJIuqkpdF0L6GnQ2NbyCCrYHwpo1JuYIdUx?= =?us-ascii?Q?MdQ6o6oSdZGWR+yN3R2aN6snI+KRz38Fuj8etxUg?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd76bec0-6b11-43ec-198a-08dad4b8d1a0 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4901.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 22:59:08.5941 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ac2dOCY80O3zCpS+joy50aoY85ej7GqVip3VdpTQ9/dD2h9TRrNtrSZoCtm7NIZXhIbbyR/1bMZpJ8sHcOB1Xg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6846 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1670021968815100001 Content-Type: text/plain; charset="utf-8" The spec file contains inconsistent use of blank lines. While trying to make significant changes to the file, I found it hurts both readability and maintainability. Remove blank lines that interrupt the overall flow and consistency. Signed-off-by: Jim Fehlig Reviewed-by: Michal Privoznik --- libvirt.spec.in | 91 ------------------------------------------------- 1 file changed, 91 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d07a43c721..562baea52e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -138,7 +138,6 @@ %define with_netcf 0%{!?_without_netcf:1} %endif =20 - # fuse is used to provide virtualized /proc for LXC %if %{with_lxc} %define with_fuse 0%{!?_without_fuse:1} @@ -258,7 +257,6 @@ Obsoletes: libvirt-daemon-uml <=3D 5.0.0 Requires: libvirt-daemon-driver-vbox =3D %{version}-%{release} %endif Requires: libvirt-daemon-driver-nwfilter =3D %{version}-%{release} - Requires: libvirt-daemon-driver-interface =3D %{version}-%{release} Requires: libvirt-daemon-driver-secret =3D %{version}-%{release} Requires: libvirt-daemon-driver-storage =3D %{version}-%{release} @@ -358,33 +356,25 @@ BuildRequires: libwsman-devel >=3D 2.6.3 BuildRequires: audit-libs-devel # we need /usr/sbin/dtrace BuildRequires: systemtap-sdt-devel - # For mount/umount in FS driver BuildRequires: util-linux # For showmount in FS driver (netfs discovery) BuildRequires: nfs-utils - # Fedora build root suckage BuildRequires: gawk - # For storage wiping with different algorithms BuildRequires: scrub - %if %{with_numad} BuildRequires: numad %endif - %if %{with_wireshark} BuildRequires: wireshark-devel %endif - %if %{with_libssh} BuildRequires: libssh-devel >=3D 0.8.1 %endif - BuildRequires: rpcgen BuildRequires: libtirpc-devel - # Needed for the firewalld_reload macro %if %{with_firewalld_zone} BuildRequires: firewalld-filesystem @@ -404,7 +394,6 @@ BuildRequires: mingw32-portablexdr BuildRequires: mingw32-dlfcn BuildRequires: mingw32-libssh2 BuildRequires: mingw32-curl - BuildRequires: mingw64-filesystem BuildRequires: mingw64-gcc BuildRequires: mingw64-binutils @@ -440,28 +429,23 @@ Summary: Server side daemon and supporting files for = libvirt library =20 # The client side, i.e. shared libs are in a subpackage Requires: libvirt-libs =3D %{version}-%{release} - # The libvirt-guests.sh script requires virsh from libvirt-client subpacka= ge, # but not every deployment wants to use libvirt-guests service. Using # Recommends here will install libvirt-client by default (if available), b= ut # RPM won't complain if the package is unavailable, masked, or removed lat= er. Recommends: libvirt-client =3D %{version}-%{release} - # netcat is needed on the server side so that clients that have # libvirt < 6.9.0 can connect, but newer versions will prefer # virt-ssh-helper. Making this a Recommends means that it gets # installed by default, but can still be removed if compatibility # with old clients is not required Recommends: /usr/bin/nc - # for modprobe of pci devices Requires: module-init-tools - # for /sbin/ip Requires: iproute # for /sbin/tc Requires: iproute-tc - Requires: polkit >=3D 0.112 %if %{with_dmidecode} # For virConnectGetSysinfo @@ -523,7 +507,6 @@ The network driver plugin for the libvirtd daemon, prov= iding an implementation of the virtual network APIs using the Linux bridge capabilities. =20 - %package daemon-driver-nwfilter Summary: Nwfilter driver plugin for the libvirtd daemon Requires: libvirt-daemon =3D %{version}-%{release} @@ -536,7 +519,6 @@ The nwfilter driver plugin for the libvirtd daemon, pro= viding an implementation of the firewall APIs using the ebtables, iptables and ip6tables capabilities =20 - %package daemon-driver-nodedev Summary: Nodedev driver plugin for the libvirtd daemon Requires: libvirt-daemon =3D %{version}-%{release} @@ -551,7 +533,6 @@ The nodedev driver plugin for the libvirtd daemon, prov= iding an implementation of the node device APIs using the udev capabilities. =20 - %package daemon-driver-interface Summary: Interface driver plugin for the libvirtd daemon Requires: libvirt-daemon =3D %{version}-%{release} @@ -604,7 +585,6 @@ Requires: lvm2 The storage driver backend adding implementation of the storage APIs for b= lock volumes using lvm. =20 - %package daemon-driver-storage-disk Summary: Storage driver plugin for disk Requires: libvirt-daemon-driver-storage-core =3D %{version}-%{release} @@ -616,7 +596,6 @@ Requires: device-mapper The storage driver backend adding implementation of the storage APIs for b= lock volumes using the host disks. =20 - %package daemon-driver-storage-scsi Summary: Storage driver plugin for local scsi devices Requires: libvirt-daemon-driver-storage-core =3D %{version}-%{release} @@ -626,7 +605,6 @@ Requires: libvirt-libs =3D %{version}-%{release} The storage driver backend adding implementation of the storage APIs for s= csi host devices. =20 - %package daemon-driver-storage-iscsi Summary: Storage driver plugin for iscsi Requires: libvirt-daemon-driver-storage-core =3D %{version}-%{release} @@ -637,7 +615,6 @@ Requires: iscsi-initiator-utils The storage driver backend adding implementation of the storage APIs for i= scsi volumes using the host iscsi stack. =20 - %if %{with_storage_iscsi_direct} %package daemon-driver-storage-iscsi-direct Summary: Storage driver plugin for iscsi-direct @@ -649,7 +626,6 @@ The storage driver backend adding implementation of the= storage APIs for iscsi volumes using libiscsi direct connection. %endif =20 - %package daemon-driver-storage-mpath Summary: Storage driver plugin for multipath volumes Requires: libvirt-daemon-driver-storage-core =3D %{version}-%{release} @@ -660,7 +636,6 @@ Requires: device-mapper The storage driver backend adding implementation of the storage APIs for multipath storage using device mapper. =20 - %if %{with_storage_gluster} %package daemon-driver-storage-gluster Summary: Storage driver plugin for gluster @@ -678,7 +653,6 @@ The storage driver backend adding implementation of the= storage APIs for gluster volumes using libgfapi. %endif =20 - %if %{with_storage_rbd} %package daemon-driver-storage-rbd Summary: Storage driver plugin for rbd @@ -690,7 +664,6 @@ The storage driver backend adding implementation of the= storage APIs for rbd volumes using the ceph protocol. %endif =20 - %if %{with_storage_zfs} %package daemon-driver-storage-zfs Summary: Storage driver plugin for ZFS @@ -705,7 +678,6 @@ The storage driver backend adding implementation of the= storage APIs for ZFS volumes. %endif =20 - %package daemon-driver-storage Summary: Storage driver plugin including all backends for the libvirtd dae= mon Requires: libvirt-daemon-driver-storage-core =3D %{version}-%{release} @@ -732,7 +704,6 @@ The storage driver plugin for the libvirtd daemon, prov= iding an implementation of the storage APIs using LVM, iSCSI, parted and more. =20 - %if %{with_qemu} %package daemon-driver-qemu Summary: QEMU driver plugin for the libvirtd daemon @@ -753,7 +724,6 @@ an implementation of the hypervisor driver APIs using QEMU %endif =20 - %if %{with_lxc} %package daemon-driver-lxc Summary: LXC driver plugin for the libvirtd daemon @@ -769,7 +739,6 @@ an implementation of the hypervisor driver APIs using the Linux kernel %endif =20 - %if %{with_vbox} %package daemon-driver-vbox Summary: VirtualBox driver plugin for the libvirtd daemon @@ -782,7 +751,6 @@ an implementation of the hypervisor driver APIs using VirtualBox %endif =20 - %if %{with_libxl} %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon @@ -796,8 +764,6 @@ an implementation of the hypervisor driver APIs using Libxl %endif =20 - - %if %{with_qemu_tcg} %package daemon-qemu Summary: Server side daemon & driver required to run QEMU guests @@ -817,7 +783,6 @@ Server side daemon and driver required to manage the vi= rtualization capabilities of the QEMU TCG emulators %endif =20 - %if %{with_qemu_kvm} %package daemon-kvm Summary: Server side daemon & driver required to run KVM guests @@ -837,7 +802,6 @@ Server side daemon and driver required to manage the vi= rtualization capabilities of the KVM hypervisor %endif =20 - %if %{with_lxc} %package daemon-lxc Summary: Server side daemon & driver required to run LXC guests @@ -856,7 +820,6 @@ Server side daemon and driver required to manage the vi= rtualization capabilities of LXC %endif =20 - %if %{with_libxl} %package daemon-xen Summary: Server side daemon & driver required to run XEN guests @@ -998,7 +961,6 @@ MinGW Windows libvirt virtualization library. %endif =20 %prep - %autosetup -S git_am =20 %build @@ -1152,7 +1114,6 @@ exit 1 %define who %{?packager}%{!?packager:Unknown} %define arg_packager -Dpackager=3D"%{who}, %{when}, %{where}" %define arg_packager_version -Dpackager_version=3D"%{release}" - %define arg_selinux_mount -Dselinux_mount=3D"/sys/fs/selinux" =20 # place macros above and build commands below this comment @@ -1396,7 +1357,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-g= uests.sh =20 %endif =20 - %check # Building on slow archs, like emulated s390x in Fedora copr, requires # raising the test timeout @@ -1435,7 +1395,6 @@ fi \ # libvirtd. The uid number is irrelevant, so we use dynamic allocation # described at the above link. getent group libvirt >/dev/null || groupadd -r libvirt - exit 0 =20 %post daemon @@ -1446,14 +1405,11 @@ exit 0 %else %libvirt_daemon_systemd_post_inet libvirtd %endif - %systemd_post libvirt-guests.service - %libvirt_daemon_schedule_restart libvirtd =20 %preun daemon %systemd_preun libvirt-guests.service - %libvirt_daemon_systemd_preun_inet libvirtd %libvirt_daemon_systemd_preun_inet virtproxyd %libvirt_daemon_systemd_preun_priv virtlogd @@ -1499,7 +1455,6 @@ then /bin/systemctl start libvirtd.service >/dev/null 2>&1 || : fi fi - %libvirt_daemon_finish_restart libvirtd =20 %pre daemon-driver-network @@ -1591,7 +1546,6 @@ fi %libvirt_sysconfig_posttrans virtsecretd %libvirt_daemon_perform_restart virtsecretd =20 - %pre daemon-driver-storage-core %libvirt_sysconfig_pre virtstoraged =20 @@ -1608,7 +1562,6 @@ fi %libvirt_sysconfig_posttrans virtstoraged %libvirt_daemon_perform_restart virtstoraged =20 - %if %{with_qemu} %pre daemon-driver-qemu %libvirt_sysconfig_pre virtqemud @@ -1640,7 +1593,6 @@ exit 0 %libvirt_daemon_perform_restart virtqemud %endif =20 - %if %{with_lxc} %pre daemon-driver-lxc %libvirt_sysconfig_pre virtlxcd @@ -1659,7 +1611,6 @@ exit 0 %libvirt_daemon_perform_restart virtlxcd %endif =20 - %if %{with_vbox} %post daemon-driver-vbox %if %{with_modular_daemons} @@ -1678,7 +1629,6 @@ exit 0 %libvirt_daemon_perform_restart virtvboxd %endif =20 - %if %{with_libxl} %post daemon-driver-libxl %if %{with_modular_daemons} @@ -1697,7 +1647,6 @@ exit 0 %libvirt_daemon_perform_restart virtxend %endif =20 - %post daemon-config-network if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default= .xml ; then # see if the network used by default network creates a conflict, @@ -1773,7 +1722,6 @@ exit 0 %doc libvirt-docs/* =20 %files daemon - %{_unitdir}/libvirtd.service %{_unitdir}/libvirtd.socket %{_unitdir}/libvirtd-ro.socket @@ -1800,25 +1748,19 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf - %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %dir %{_datadir}/libvirt/ - %ghost %dir %{_rundir}/libvirt/ %ghost %dir %{_rundir}/libvirt/common/ - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ - - %dir %attr(0755, root, root) %{_libdir}/libvirt/ %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/ %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so - %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd.aug %{_datadir}/augeas/lenses/virtlogd.aug @@ -1831,23 +1773,17 @@ exit 0 %if %{with_qemu} %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug %endif - %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy %{_datadir}/polkit-1/rules.d/50-libvirt.rules - %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ - %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper - %attr(0755, root, root) %{_bindir}/virt-ssh-helper - %attr(0755, root, root) %{_sbindir}/libvirtd %attr(0755, root, root) %{_sbindir}/virtproxyd %attr(0755, root, root) %{_sbindir}/virtlogd %attr(0755, root, root) %{_sbindir}/virtlockd %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh - %{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-host-validate.1* %{_mandir}/man8/virt-ssh-helper.8* @@ -1856,7 +1792,6 @@ exit 0 %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* %{_mandir}/man8/virtproxyd.8* - %{_bindir}/virt-host-validate %{_bindir}/virt-admin %{_datadir}/bash-completion/completions/virt-admin @@ -1903,7 +1838,6 @@ exit 0 %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper %{_libdir}/libvirt/connection-driver/libvirt_driver_network.so %{_mandir}/man8/virtnetworkd.8* - %if %{with_firewalld_zone} %{_prefix}/lib/firewalld/zones/libvirt.xml %{_prefix}/lib/firewalld/zones/libvirt-routed.xml @@ -2165,7 +2099,6 @@ exit 0 %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-query-dn %{_bindir}/virt-pki-validate - %{_datadir}/bash-completion/completions/virsh =20 %if %{with_qemu} @@ -2187,17 +2120,13 @@ exit 0 %{_libdir}/libvirt-admin.so.* %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ - %{_datadir}/systemtap/tapset/libvirt_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp %if %{with_qemu} %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %endif - %{_datadir}/libvirt/schemas/*.rng - %{_datadir}/libvirt/cpu_map/*.xml - %{_datadir}/libvirt/test-screenshot.png =20 %if %{with_wireshark} @@ -2245,7 +2174,6 @@ exit 0 %{_libdir}/pkgconfig/libvirt-admin.pc %{_libdir}/pkgconfig/libvirt-qemu.pc %{_libdir}/pkgconfig/libvirt-lxc.pc - %dir %{_datadir}/libvirt/api/ %{_datadir}/libvirt/api/libvirt-api.xml %{_datadir}/libvirt/api/libvirt-admin-api.xml @@ -2257,7 +2185,6 @@ exit 0 %dir %{mingw32_sysconfdir}/libvirt/ %config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt-admin.conf - %{mingw32_bindir}/libvirt-0.dll %{mingw32_bindir}/virsh.exe %{mingw32_bindir}/virt-admin.exe @@ -2267,7 +2194,6 @@ exit 0 %{mingw32_bindir}/libvirt-lxc-0.dll %{mingw32_bindir}/libvirt-qemu-0.dll %{mingw32_bindir}/libvirt-admin-0.dll - %{mingw32_libdir}/libvirt.dll.a %{mingw32_libdir}/pkgconfig/libvirt.pc %{mingw32_libdir}/pkgconfig/libvirt-qemu.pc @@ -2276,23 +2202,17 @@ exit 0 %{mingw32_libdir}/libvirt-lxc.dll.a %{mingw32_libdir}/libvirt-qemu.dll.a %{mingw32_libdir}/libvirt-admin.dll.a - %dir %{mingw32_datadir}/libvirt/ %dir %{mingw32_datadir}/libvirt/schemas/ %{mingw32_datadir}/libvirt/schemas/*.rng - %dir %{mingw32_datadir}/libvirt/api/ %{mingw32_datadir}/libvirt/api/libvirt-api.xml %{mingw32_datadir}/libvirt/api/libvirt-lxc-api.xml %{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml %{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml - %{mingw32_datadir}/libvirt/cpu_map/*.xml - %{mingw32_datadir}/libvirt/test-screenshot.png - %{mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo - %dir %{mingw32_includedir}/libvirt %{mingw32_includedir}/libvirt/libvirt.h %{mingw32_includedir}/libvirt/libvirt-common.h @@ -2312,7 +2232,6 @@ exit 0 %{mingw32_includedir}/libvirt/libvirt-lxc.h %{mingw32_includedir}/libvirt/libvirt-qemu.h %{mingw32_includedir}/libvirt/libvirt-admin.h - %{mingw32_mandir}/man1/virsh.1* %{mingw32_mandir}/man1/virt-admin.1* %{mingw32_mandir}/man1/virt-xml-validate.1* @@ -2320,12 +2239,10 @@ exit 0 %{mingw32_mandir}/man1/virt-pki-validate.1* %{mingw32_mandir}/man7/virkey*.7* =20 - %files -n mingw64-libvirt %dir %{mingw64_sysconfdir}/libvirt/ %config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt-admin.conf - %{mingw64_bindir}/libvirt-0.dll %{mingw64_bindir}/virsh.exe %{mingw64_bindir}/virt-admin.exe @@ -2335,7 +2252,6 @@ exit 0 %{mingw64_bindir}/libvirt-lxc-0.dll %{mingw64_bindir}/libvirt-qemu-0.dll %{mingw64_bindir}/libvirt-admin-0.dll - %{mingw64_libdir}/libvirt.dll.a %{mingw64_libdir}/pkgconfig/libvirt.pc %{mingw64_libdir}/pkgconfig/libvirt-qemu.pc @@ -2344,23 +2260,17 @@ exit 0 %{mingw64_libdir}/libvirt-lxc.dll.a %{mingw64_libdir}/libvirt-qemu.dll.a %{mingw64_libdir}/libvirt-admin.dll.a - %dir %{mingw64_datadir}/libvirt/ %dir %{mingw64_datadir}/libvirt/schemas/ %{mingw64_datadir}/libvirt/schemas/*.rng - %dir %{mingw64_datadir}/libvirt/api/ %{mingw64_datadir}/libvirt/api/libvirt-api.xml %{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml %{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml %{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml - %{mingw64_datadir}/libvirt/cpu_map/*.xml - %{mingw64_datadir}/libvirt/test-screenshot.png - %{mingw64_datadir}/locale/*/LC_MESSAGES/libvirt.mo - %dir %{mingw64_includedir}/libvirt %{mingw64_includedir}/libvirt/libvirt.h %{mingw64_includedir}/libvirt/libvirt-common.h @@ -2380,7 +2290,6 @@ exit 0 %{mingw64_includedir}/libvirt/libvirt-lxc.h %{mingw64_includedir}/libvirt/libvirt-qemu.h %{mingw64_includedir}/libvirt/libvirt-admin.h - %{mingw64_mandir}/man1/virsh.1* %{mingw64_mandir}/man1/virt-admin.1* %{mingw64_mandir}/man1/virt-xml-validate.1* --=20 2.38.1