From nobody Sun Feb 8 02:41:35 2026 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=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1669940548; cv=none; d=zohomail.com; s=zohoarc; b=HFiIJXOZc1BZPhsvWu/hZlc5x+l4f4k1INLzjMgLnEIyyTZksUNEmdXib4cS8FfFmMMfQA+dm2W0h/FCBIgo3BEnyALuR5EM7xOzlXIZYDMFbtBoagmJ33mE8NZ6bJWbLITvdOiHhG0l+uR0LWeIa1qh0xbZPnoGK4LNfJpxw0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669940548; 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=2Tny2EKfFMKdx/L2GRkc+thsqvvHcmURAw8/DmipyC8=; b=Kr9Nmf6pgVJuurw1KYJexUN5/lnJn2lvD5ktmfCMB+8DTyYxw8Rfi/XFdOBCR6Pi+VAVZEi6N3cJm4TRoiqzXOKM0REqEBvASvvsLB+mrmv6Kr2bbN/8e0BYQIw0PxZ6gyX2ACSzZ43wYu+8M0+OglrN52xwNDwJl63ngUpPhiE= 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=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.133.124]) by mx.zohomail.com with SMTPS id 1669940548424406.6861179107267; Thu, 1 Dec 2022 16:22:28 -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-584-LlJImKt5NEWtY6Fg5v-odw-1; Thu, 01 Dec 2022 19:22:01 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D6AB71C06ED3; Fri, 2 Dec 2022 00:21:59 +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 0AF0B1401C31; Fri, 2 Dec 2022 00:21:57 +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 D9A2619465A8; Fri, 2 Dec 2022 00:21:56 +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 4A2EE19465A0 for ; Fri, 2 Dec 2022 00:21:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2AE09C154AB; Fri, 2 Dec 2022 00:21:56 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 227FFC15BB4 for ; Fri, 2 Dec 2022 00:21:56 +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 0261B800B23 for ; Fri, 2 Dec 2022 00:21:56 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2068.outbound.protection.outlook.com [40.107.6.68]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-275-x6smRpV9MIyRk2gNpyli2Q-1; Thu, 01 Dec 2022 19:21:54 -0500 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by AM9PR04MB7540.eurprd04.prod.outlook.com (2603:10a6:20b:283::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.8; Fri, 2 Dec 2022 00:21:51 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f%7]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 00:21:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669940525; 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=2Tny2EKfFMKdx/L2GRkc+thsqvvHcmURAw8/DmipyC8=; b=hZwMl2V8+1+iYqj5uflY8p7HSUMtH3Laq7ajqDUNNAgIgP19qZqh2DtfkIX8CJ2Jk279eT Gmyof9QvgjW+snSirWuXqiR+iiAOHjLDJa+92kmFA1z884E5qVLshd+HRjflNHsPESwEPU htnW+Wd7DsrlacLZtld19v0L9oSick4= X-MC-Unique: LlJImKt5NEWtY6Fg5v-odw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: x6smRpV9MIyRk2gNpyli2Q-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH] spec: Remove use of %{name} macro Date: Thu, 1 Dec 2022 17:21:42 -0700 Message-ID: <20221202002142.10199-1-jfehlig@suse.com> X-ClientProxiedBy: FR0P281CA0140.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::6) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|AM9PR04MB7540:EE_ X-MS-Office365-Filtering-Correlation-Id: 7cb20ec2-a698-4ea2-97c0-08dad3fb3559 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: tydzNooZMIMKDv0v+pwmV5JaceJdfCL2i2mYeBLErBRGIp/EoyB+W597042zvbg+FU8LeoWjgOMqvkk+EDqvAPXAkVgVCWZ+mlC3VO88iSRERU+lJH0tMALChuVL8rf1gO5eolEt+duaQ9r/amUBihDl+bcQn3ImcV8Ns4OINzJCAxDxKwT/98Q4n4B/eOlgU/aUoDcEGQmNuLzYJzvcv3bGtlWn4GzMgNmjHYBVnlo5o4/BFtZLmUFba6gA17ejEmmUm+PA0aT8dkLbhyjO7aDRUNOCopxbrUtlkVhICv5Ha1YqOHmov3Z73+xHHaaBL4HbZuzBIkw87ICz82VajdYG58vEYdKlYFZPeTHe/HHS+FeqBQyl6hC/ac8akNngaNYUw/9miQEse7q4sKusZoL0PtlQtf/Xu53R0eDCHPjB9HG2QAcD4gHoMJzbgJDOQb2y1qK+ThDBltcLTiKYzZmr1Smu7jK6nYaO78uIob/MAkSSfTX4JmDDHuNe1p6vudwCakogor266ER249smJeDjRDZlMt/DNEse5uDcHSmfZH9Y58GMGnz2WI7Vt10OstXGI1wl/QYGfaSUylR7+eq1F15opkEnzNreUJJJc6qxLwf5HJEJ7RESke5sOp0iKQNnUUDWSclv/xr/9TSiNw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4899.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(376002)(136003)(39860400002)(346002)(366004)(396003)(451199015)(83380400001)(86362001)(6486002)(6506007)(6512007)(36756003)(38100700002)(2616005)(186003)(1076003)(5660300002)(26005)(41300700001)(478600001)(6666004)(66556008)(66476007)(8676002)(8936002)(2906002)(6916009)(66946007)(316002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zHVrEoQHPQ/cfX4qYJdEGZ52jcMWutIQIS8bZ0rpCZpQy+jzWenbY46d2BAF?= =?us-ascii?Q?WvhqIukm7MLgZ/Rn9Q1W4UFvdoYPUWOKh1NNYWhCrQNiOiAqgaTX20CeqzI1?= =?us-ascii?Q?/yt4XGcBPZw576se/+qSMiBb9oQ4IPEl9C4BVidM0v+DbkW4uKrtgvo+x9Fz?= =?us-ascii?Q?rXMRyl716UUNIyk4CgJ96pnvvSM/GmPMISf4aIdfJTHJIp6hW4+8WvfiUYM/?= =?us-ascii?Q?Z8sI0WL1XB/sUmLj3ML1xRHU4+qJty63my8tt0gOv66Vte8UA/SN2NmSfzcJ?= =?us-ascii?Q?MihAuqZRt7Rf8VxvCD2v6nZviocn9xV8qGa6TmkGKwoVgh3wooByP0lpL8/L?= =?us-ascii?Q?rQCCwe/z/+izkhbKdPEvs7edvzuh8/Kj7flSzjNYuuQrTHhLB75WtQw86Ap7?= =?us-ascii?Q?mSnlWwiCLk9I+PKmbMtdv0JUZtcCucL8GvYng8VzoxFhOHdjea+SbrT4s5Tu?= =?us-ascii?Q?js10GugT4GQnsJpGzbcgoJbcklXZO6HS/7MYBAqgBSijeHVQxFZqfBygen3x?= =?us-ascii?Q?BylGt2KKj0AM6EGuiEdv/S/YrnXvHLfDJ+xn+9e+usOf1oN7DlBzNiQzBtrY?= =?us-ascii?Q?LbLJ4oCrh06NLFAr2RETMYiiaE2fjsfcTJ6phtJXZ4IgjrY5QNNeOK/rp+9d?= =?us-ascii?Q?UQ1uNJen25D9igvuYaPbx9qwxm2xAjjqlUlRn+6hv/NnIx97cEtJlZ8JnSjv?= =?us-ascii?Q?tMoJKcXTPGKtyyZCA6XFrOyyMJzWbUNlYg60Na1tqNtfLaDRo8OcET9JdZug?= =?us-ascii?Q?juyJghOL/KFDqG0TROV40gicPNxUoRulQpx0fB26nKC7/4G18oqolS1JjF1t?= =?us-ascii?Q?bKerahbszAMtnwbBqA9G6AUtv32j11vqF6WzgddHaOyFZeXnU840wQQ5ruyx?= =?us-ascii?Q?CHm1vq50hGUJ0heXJw5VyWNYE3fsjmBDwaWEG9nCqERdVmDFydqfxEzEVHbF?= =?us-ascii?Q?gqHprqN8+8mjWTGk97rxnN2VjseN8hSsQBGNFK/UYn59NFwHcHV5QqGbcLYx?= =?us-ascii?Q?ul6Brpepb4jjj3nbpi0sVBL8fUppAzbT5KuBcX/oD8UuRpbeVbLVMNwyuY15?= =?us-ascii?Q?WOcfD/YYsC7N8jGNUmiC2WFnwnaBnrGLjqXHWDFmHmG50C/uaQd0ZK0tPQrH?= =?us-ascii?Q?4NOpMAdOACaGEBxUEuD9e1ieP9NmuvGxmz+Y7uNxLeoal2At7Fbs4HjCrQVp?= =?us-ascii?Q?xbo1fnbfXlA6UccbHdyhWFf1NdeRxlXfSRuAsnSkj3FjRWTk/L17i7pT8CtX?= =?us-ascii?Q?xBmZ8zqCelrdGUnQc3aHIUY9KjBZILpsL0/YdYZXDe/fJTdozykilZgvPc9X?= =?us-ascii?Q?LLB2UfwV7oBP7dEFSIzhgo8YFzfmbWiC8rVVclNrp40FDFXJz1nJMRnaRPN0?= =?us-ascii?Q?k/JEaNQ0wLuaFcvjXB3W0QK3ZLVA/s+o9OAtLnSAALLXWS4rvX3yHKV8JN5M?= =?us-ascii?Q?b1/Zj6VwkJT9IMsmLNre+9nahEyXFGMZBLyekA5WfeWb0aFp9CQIoiZa+WwG?= =?us-ascii?Q?pFSLdfXTRsf3mLthJmgcq7UbLr3iXNWXbo2GNbe5jVJmKs6CJqEUxzx6e6un?= =?us-ascii?Q?dJ9y3hTCIKj8MUgpISrIf1VQ7JsV0bq74jAszM6f?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7cb20ec2-a698-4ea2-97c0-08dad3fb3559 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 00:21:51.2756 (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: CS3y38gh9CCygUKeACDLV+arSAwREqBSa/FiWOaTzMfKHY5WSDeSXLk4wOp+c0hUJ9FzWdQc8UMk3qTtsAB4vg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7540 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.7 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: 1669940559113100001 Content-Type: text/plain; charset="utf-8" The spec file uses both "libvirt" and "%{name}", but in reality the expanded value of %{name} will never change. Drop the macro in favor of the explicit and more readable "libvirt". Signed-off-by: Jim Fehlig Reviewed-by: Jiri Denemark --- libvirt.spec.in | 66 ++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index fa94cda3c5..d07a43c721 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -439,13 +439,13 @@ Summary: Server side daemon and supporting files for = libvirt library # for subpackages are listed later in those subpackages) =20 # The client side, i.e. shared libs are in a subpackage -Requires: %{name}-libs =3D %{version}-%{release} +Requires: libvirt-libs =3D %{version}-%{release} =20 # 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: %{name}-client =3D %{version}-%{release} +Recommends: libvirt-client =3D %{version}-%{release} =20 # netcat is needed on the server side so that clients that have # libvirt < 6.9.0 can connect, but newer versions will prefer @@ -896,7 +896,7 @@ capabilities of VirtualBox =20 %package client Summary: Client side utilities of the libvirt library -Requires: %{name}-libs =3D %{version}-%{release} +Requires: libvirt-libs =3D %{version}-%{release} # Needed by virt-pki-validate script. Requires: gnutls-utils =20 @@ -909,7 +909,7 @@ capabilities of recent versions of Linux (and other OSe= s). =20 %package client-qemu Summary: Additional client side utilities for QEMU -Requires: %{name}-libs =3D %{version}-%{release} +Requires: libvirt-libs =3D %{version}-%{release} Requires: python3-libvirt >=3D 3.7.0 =20 %description client-qemu @@ -931,7 +931,7 @@ Shared libraries for accessing the libvirt daemon. %package wireshark Summary: Wireshark dissector plugin for libvirt RPC transactions Requires: wireshark -Requires: %{name}-libs =3D %{version}-%{release} +Requires: libvirt-libs =3D %{version}-%{release} =20 %description wireshark Wireshark dissector plugin for better analysis of libvirt RPC traffic. @@ -940,7 +940,7 @@ Wireshark dissector plugin for better analysis of libvi= rt RPC traffic. %if %{with_lxc} %package login-shell Summary: Login shell for connecting users to an LXC container -Requires: %{name}-libs =3D %{version}-%{release} +Requires: libvirt-libs =3D %{version}-%{release} =20 %description login-shell Provides the set-uid virt-login-shell binary that is used to @@ -950,7 +950,7 @@ namespaces. =20 %package devel Summary: Libraries, includes, etc. to compile with the libvirt library -Requires: %{name}-libs =3D %{version}-%{release} +Requires: libvirt-libs =3D %{version}-%{release} Requires: pkgconfig =20 %description devel @@ -962,8 +962,8 @@ Summary: Sanlock lock manager plugin for QEMU driver Requires: sanlock >=3D 2.4 #for virt-sanlock-cleanup require augeas Requires: augeas -Requires: %{name}-daemon =3D %{version}-%{release} -Requires: %{name}-libs =3D %{version}-%{release} +Requires: libvirt-daemon =3D %{version}-%{release} +Requires: libvirt-libs =3D %{version}-%{release} =20 %description lock-sanlock Includes the Sanlock lock manager plugin for the QEMU @@ -1157,7 +1157,7 @@ exit 1 =20 # place macros above and build commands below this comment =20 -export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_specdir}/%{name}.spec) +export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_specdir}/libvirt.spec) =20 %meson \ -Drunstatedir=3D%{_rundir} \ @@ -1312,7 +1312,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) %install rm -fr %{buildroot} =20 -export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_specdir}/%{name}.spec) +export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_specdir}/libvirt.spec) =20 %meson_install =20 @@ -1882,7 +1882,7 @@ exit 0 %{_unitdir}/virtinterfaced-admin.socket %attr(0755, root, root) %{_sbindir}/virtinterfaced %ghost %dir %{_rundir}/libvirt/interface/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so %{_mandir}/man8/virtinterfaced.8* =20 %files daemon-driver-network @@ -1901,7 +1901,7 @@ exit 0 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper -%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_network.so %{_mandir}/man8/virtnetworkd.8* =20 %if %{with_firewalld_zone} @@ -1922,7 +1922,7 @@ exit 0 %{_unitdir}/virtnodedevd-admin.socket %attr(0755, root, root) %{_sbindir}/virtnodedevd %ghost %dir %{_rundir}/libvirt/nodedev/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so %{_mandir}/man8/virtnodedevd.8* =20 %files daemon-driver-nwfilter @@ -1938,7 +1938,7 @@ exit 0 %ghost %dir %{_rundir}/libvirt/network/ %ghost %dir %{_rundir}/libvirt/nwfilter-binding/ %ghost %dir %{_rundir}/libvirt/nwfilter/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so %{_mandir}/man8/virtnwfilterd.8* =20 %files daemon-driver-secret @@ -1952,7 +1952,7 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtsecretd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/ %ghost %dir %{_rundir}/libvirt/secrets/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so %{_mandir}/man8/virtsecretd.8* =20 %files daemon-driver-storage @@ -1970,45 +1970,45 @@ exit 0 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/autostart/ %ghost %dir %{_rundir}/libvirt/storage/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so -%{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so +%{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so %{_mandir}/man8/virtstoraged.8* =20 %files daemon-driver-storage-disk -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_disk.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so =20 %files daemon-driver-storage-logical -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_logical.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so =20 %files daemon-driver-storage-scsi -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_scsi.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so =20 %files daemon-driver-storage-iscsi -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so =20 %if %{with_storage_iscsi_direct} %files daemon-driver-storage-iscsi-direct -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so %endif =20 %files daemon-driver-storage-mpath -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so =20 %if %{with_storage_gluster} %files daemon-driver-storage-gluster -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so -%{_libdir}/%{name}/storage-file/libvirt_storage_file_gluster.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so +%{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so %endif =20 %if %{with_storage_rbd} %files daemon-driver-storage-rbd -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so %endif =20 %if %{with_storage_zfs} %files daemon-driver-storage-zfs -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so +%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so %endif =20 %if %{with_qemu} @@ -2044,7 +2044,7 @@ exit 0 %dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug -%{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/swtpm/ %dir %attr(0730, tss, tss) %{_localstatedir}/log/swtpm/libvirt/qemu/ %{_bindir}/virt-qemu-run @@ -2072,7 +2072,7 @@ exit 0 %{_datadir}/augeas/lenses/libvirtd_lxc.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug %attr(0755, root, root) %{_libexecdir}/libvirt_lxc -%{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so %{_mandir}/man8/virtlxcd.8* %endif =20 @@ -2100,7 +2100,7 @@ exit 0 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/t= arget/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/dump/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/save/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so %{_mandir}/man8/virtxend.8* %endif =20 @@ -2114,7 +2114,7 @@ exit 0 %{_unitdir}/virtvboxd-ro.socket %{_unitdir}/virtvboxd-admin.socket %attr(0755, root, root) %{_sbindir}/virtvboxd -%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so +%{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so %{_mandir}/man8/virtvboxd.8* %endif =20 --=20 2.38.1