[Pkg-libvirt-commits] [Git][libvirt-team/libvirt-python][debian/sid] 3 commits: d/watch: allow libvirt_python as possible tarball naming
Pino Toscano (@pino)
gitlab at salsa.debian.org
Wed Oct 8 06:04:16 BST 2025
Pino Toscano pushed to branch debian/sid at Libvirt Packaging Team / libvirt-python
Commits:
a5cc18c9 by Pino Toscano at 2025-10-08T07:00:36+02:00
d/watch: allow libvirt_python as possible tarball naming
- - - - -
c350ae74 by Pino Toscano at 2025-10-08T07:01:20+02:00
New upstream version 11.8.0
- - - - -
cf622a45 by Pino Toscano at 2025-10-08T07:01:41+02:00
Update upstream source from tag 'upstream/11.8.0'
Update to upstream version '11.8.0'
with Debian dir fd0c48960a49d9d93706eb6692ae199815683d7f
- - - - -
8 changed files:
- ChangeLog
- Makefile
- PKG-INFO
- VERSION
- debian/changelog
- debian/watch
- libvirt-python.spec
- setup.py
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,38 @@
+ 2025- 9- 11 Jiri Denemark <jdenemar at redhat.com>
+
+ spec: Set dist_name when creating a distribution tarball
+ When a distribution tarball is created (python3 -m build -n -s) the
+ dist_name in the spec file included in that tarball must match the
+ actual tarball name. The tarball name depends on the setuptools version
+ used to create it rather than on the version of setuptools installed on
+ the system RPMs are built.
+
+ Fixes: ed8ab5075d9190fdcd2894412d2127ac2a1d9535
+ Reported-by: Daniel P. Berrangé <berrange at redhat.com>
+
+
+ 2025- 9- 11 Jiri Denemark <jdenemar at redhat.com>
+
+ setup.py: Add support for multiple replacements in *.in
+
+
+ 2025- 9- 10 Jiri Denemark <jdenemar at redhat.com>
+
+ build: Adapt to PEP 625 distribution file naming
+ 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.
+
+ Reviewed-by: Pavel Hrdina <phrdina at redhat.com>
+
+
+ 2025- 9- 1 Jiri Denemark <jdenemar at redhat.com>
+
+ Post-release version bump to 11.8.0
+
+
2025- 8- 1 Jiri Denemark <jdenemar at redhat.com>
Post-release version bump to 11.7.0
=====================================
Makefile
=====================================
@@ -19,4 +19,4 @@ test: all
tox
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
=====================================
PKG-INFO
=====================================
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: libvirt-python
-Version: 11.7.0
+Version: 11.8.0
Summary: The libvirt virtualization API python binding
Home-page: http://www.libvirt.org
Maintainer: Libvirt Maintainers
=====================================
VERSION
=====================================
@@ -1 +1 @@
-11.7.0
+11.8.0
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libvirt-python (11.8.0-1~1.gbpf3856e) UNRELEASED; urgency=medium
+
+ ** SNAPSHOT build @f3856e20a9b2bfba3db02b8a564f1021f214565d **
+
+ * d/watch: allow libvirt_python as possible tarball naming
+ * New upstream version 11.8.0
+
+ -- Pino Toscano <pino at debian.org> Wed, 08 Oct 2025 07:01:40 +0200
+
libvirt-python (11.7.0-1) unstable; urgency=medium
* New upstream version 11.7.0
=====================================
debian/watch
=====================================
@@ -1,4 +1,4 @@
version=4
opts="uversionmangle=s/\.-rc/~rc/;s/\.+$//,pgpsigurlmangle=s/$/.asc/" \
- https://download.libvirt.org/python/libvirt-python-([\d\.]+)(?:-rc\d)?@ARCHIVE_EXT@
+ https://download.libvirt.org/python/libvirt(?:-|_)python-([\d\.]+)(?:-rc\d)?@ARCHIVE_EXT@
=====================================
libvirt-python.spec
=====================================
@@ -12,11 +12,13 @@
%define supported_platform 0
%endif
+%define dist_name libvirt_python
+
Summary: The libvirt virtualization API python3 binding
Name: libvirt-python
-Version: 11.7.0
+Version: 11.8.0
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 == %{version}
@@ -51,7 +53,7 @@ supplied by the libvirt library to use the virtualization capabilities
of recent versions of Linux (and other OSes).
%prep
-%setup -q
+%setup -q -n %{dist_name}-%{version}
# Unset execute bit for example scripts; it can introduce spurious
# RPM dependencies, like /usr/bin/python3
=====================================
setup.py
=====================================
@@ -189,16 +189,21 @@ class my_sdist(sdist):
sdist.finalize_options(self)
@staticmethod
- def _gen_from_in(file_in, file_out, replace_pattern, replace):
+ def _gen_from_in(file_in, file_out, replacements):
with open(file_in) as f_in, open(file_out, "w") as f_out:
for line in f_in:
- f_out.write(line.replace(replace_pattern, replace))
+ for pattern, replace in replacements.items():
+ line = line.replace(pattern, replace)
+ f_out.write(line)
def gen_rpm_spec(self):
+ full_name = self.distribution.get_fullname()
+ dist_name = full_name[:full_name.rfind("-")]
+
return self._gen_from_in("libvirt-python.spec.in",
"libvirt-python.spec",
- "@VERSION@",
- getVersion())
+ {"@VERSION@": getVersion(),
+ "@DIST_NAME@": dist_name})
def gen_authors(self):
@@ -209,8 +214,7 @@ class my_sdist(sdist):
authors = [" " + author for author in authors]
self._gen_from_in("AUTHORS.in",
"AUTHORS",
- "@AUTHORS@",
- "\n".join(authors))
+ {"@AUTHORS@": "\n".join(authors)})
def gen_changelog(self):
cmd = ["git", "log", "--pretty=format:%H:%ct %an <%ae>%n%n%s%n%b%n"]
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt-python/-/compare/e1cd22e6c2f4bc68b656fd613ccc775007e1824c...cf622a450a623d679ac051ba122cd9498ffb9250
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt-python/-/compare/e1cd22e6c2f4bc68b656fd613ccc775007e1824c...cf622a450a623d679ac051ba122cd9498ffb9250
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20251008/a7ae7770/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list