From nobody Sun Oct 5 00:10:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1757505975; cv=none; d=zohomail.com; s=zohoarc; b=YkKNF0bGMD/URwsDqyG00EHBZ+lfTafSmUzi1xuLo5FRNjf8YeQtTPBeY7yHyDPK6VjKYlW3SRwThTblCKoGdJ96dT7qBHMNLy4OMKv0850wH/sDeth7RS+L3rNgtsJtPxbMMvZBsboQNCT3tfqXnwYrlvxj1P+ZvfU2uDkVSBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757505975; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc; bh=LgGwF458EYGfq6BJXafW7ki+P5568pYKv2h1gi+t7lA=; b=jI86xcoGEFO5M9iI7L/RBrlZhxgHHaw6PtQOP7XM7OkCoixZVkw8aPg2V3dIsSQ6VnApPJ7u9FcdujmyNbRLmvqpw38S9tvfHlRVcbgZb3jX3bTCM7nA0d0dHP2VjffdRHpStFCgcfqczaSi7LSLpviVjXE3GDDZxB8JSXv+Ltw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1757505975294495.6250413158393; Wed, 10 Sep 2025 05:06:15 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1C24541B92; Wed, 10 Sep 2025 08:06:14 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id B7BFB41B83; Wed, 10 Sep 2025 08:05:19 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 43BDF41B14; Wed, 10 Sep 2025 08:04:55 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 16C8D419A8 for ; Wed, 10 Sep 2025 08:04:54 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-245-1pWNAwrLNsuM2rtzpMw6SA-1; Wed, 10 Sep 2025 08:04:51 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4C87719560AD for ; Wed, 10 Sep 2025 12:04:50 +0000 (UTC) Received: from orkuz (unknown [10.43.3.115]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9FF911800451 for ; Wed, 10 Sep 2025 12:04:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757505893; h=from:from: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; bh=LgGwF458EYGfq6BJXafW7ki+P5568pYKv2h1gi+t7lA=; b=Crw6FjWCgmTW86djNFwiJBrPaLu2SQghwE1bEZ8QT5OQiVmGP5cezKIRfDqYj/Wea99YHA EdVDL9j9fjrM5eiEbNWyqu0SYB/dCZc5A6Fh7c6311sPwDpSONfuyyie8KGTOXTWpAQOqI LqTBblTdbtyqciFNhU/PCsKAQHmn8y0= X-MC-Unique: 1pWNAwrLNsuM2rtzpMw6SA-1 X-Mimecast-MFC-AGG-ID: 1pWNAwrLNsuM2rtzpMw6SA_1757505890 To: devel@lists.libvirt.org Subject: [libvirt-python PATCH] build: Adapt to PEP 625 distribution file naming Date: Wed, 10 Sep 2025 14:04:39 +0200 Message-ID: <3c64427053d6f36f50a0b353dd104b2fc77c4fd9.1757505879.git.jdenemar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: uGtYmMU2WD0FwfLFOptcuDZTv7eqhoMDecMijpqacR0_1757505890 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: J7BFNOCDACBN5FFM634DOFR5G2GUWRN6 X-Message-ID-Hash: J7BFNOCDACBN5FFM634DOFR5G2GUWRN6 X-MailFrom: jdenemar@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jiri Denemark via Devel Reply-To: Jiri Denemark X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1757505979496116600 Content-Type: text/plain; charset="utf-8" The version of setuptools shipped by Fedora 42 is PEP 625 compliant, which requires distribution files to contain a normalized package name. Thus the generated tarball is called libvirt_python-$VER.tar.gz rather than libvirt-python-$VER.tar.gz created by older setuptools. The source directory inside the tarball follows the same naming. Signed-off-by: Jiri Denemark Reviewed-by: Pavel Hrdina --- .gitlab-ci.yml | 4 ++-- Makefile | 2 +- libvirt-python.spec.in | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc4ff48..1267c47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ stages: - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip" ; then unset CFLAGS ; - rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild" -ta d= ist/libvirt-python*tar.gz ; + rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild" -ta d= ist/libvirt[-_]python*tar.gz ; mv rpmbuild/RPMS/x86_64/ libvirt-python-rpms ; fi =20 @@ -51,7 +51,7 @@ stages: - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip" ; then unset CFLAGS ; - rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild" -ta d= ist/libvirt-python*tar.gz ; + rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild" -ta d= ist/libvirt[-_]python*tar.gz ; mv rpmbuild/RPMS/x86_64/ libvirt-python-rpms ; fi =20 diff --git a/Makefile b/Makefile index 925af40..0b2af28 100644 --- a/Makefile +++ b/Makefile @@ -19,4 +19,4 @@ test: all tox =20 rpm: all - rpmbuild -ta dist/libvirt-python-$(shell tr -d '\n' < VERSION).tar.gz + rpmbuild -ta dist/libvirt[-_]python-$(shell tr -d '\n' < VERSION).tar.gz diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index e260eaf..dd0c71b 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -12,11 +12,17 @@ %define supported_platform 0 %endif =20 +%if 0%{?rhel} || 0%{?fedora} < 42 + %define dist_name %{name} +%else + %define dist_name libvirt_python +%endif + Summary: The libvirt virtualization API python3 binding Name: libvirt-python Version: @VERSION@ Release: 1%{?dist} -Source0: https://libvirt.org/sources/python/%{name}-%{version}.tar.gz +Source0: https://libvirt.org/sources/python/%{dist_name}-%{version}.tar.gz Url: https://libvirt.org License: LGPL-2.1-or-later BuildRequires: libvirt-devel =3D=3D %{version} @@ -51,7 +57,7 @@ supplied by the libvirt library to use the virtualization= capabilities of recent versions of Linux (and other OSes). =20 %prep -%setup -q +%setup -q -n %{dist_name}-%{version} =20 # Unset execute bit for example scripts; it can introduce spurious # RPM dependencies, like /usr/bin/python3 --=20 2.51.0