public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mercurial] rawhide: Merge branch 'f44' into rawhide
@ 2026-06-29 20:37 Mads Kiilerich
  0 siblings, 0 replies; only message in thread
From: Mads Kiilerich @ 2026-06-29 20:37 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/mercurial
Branch : rawhide
Commit : c43f1bd04fe9000d0b74ac4836fbd93645ac0ed0
Author : Mads Kiilerich <mads@kiilerich.com>
Date   : 2026-06-29T22:37:19+02:00
Stats  : +43/-3 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/mercurial/c/c43f1bd04fe9000d0b74ac4836fbd93645ac0ed0?branch=rawhide

Log:
Merge branch 'f44' into rawhide

---
diff --git a/.gitignore b/.gitignore
index e2b442b..d5dabf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,4 @@ mercurial-1.6.2.tar.gz
 /mercurial-7.1.2.tar.gz
 /mercurial-7.2.tar.gz
 /mercurial-7.2.1.tar.gz
+/mercurial-7.2.3.tar.gz

diff --git a/mercurial.spec b/mercurial.spec
index 113be6a..1504238 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -9,8 +9,8 @@
 
 Summary: A fast, lightweight Source Control Management system
 Name: mercurial
-Version: 7.2.1
-Release: 2%{?dist}
+Version: 7.2.3
+Release: 1%{?dist}
 
 # Release: 1.rc1%%{?dist}
 
@@ -280,6 +280,9 @@ rm -rf %{buildroot}%{python3_sitearch}/mercurial/locale
 
 
 %changelog
+* Mon Jun 29 2026 Mads Kiilerich <mads@kiilerich.com> - 7.2.3-1
+- mercurial 7.2.3
+
 * Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 7.2.1-2
 - Rebuilt for Python 3.15
 

diff --git a/sources b/sources
index a02feed..894f613 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mercurial-7.2.1.tar.gz) = 196045832717d3f7b4e08fee97d093249a8334105dff55691309ac93dcbcd7d9f3f53326a8295be9e837572b99338003756b343e350a711ee4b17f549031a8d3
+SHA512 (mercurial-7.2.3.tar.gz) = bc45397354d24e40fc59708995c1bbaaa04b8ac2fbd9ac5fcb94716c6d94a55071f4b586e5fc3295fb7b59906d96bbc8072d3ec8df811d95a5cc946e8b554ec1

diff --git a/.gitignore b/.gitignore
index 9f56cbc..d5dabf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,4 +124,5 @@ mercurial-1.6.2.tar.gz
 /mercurial-7.1.1.tar.gz
 /mercurial-7.1.2.tar.gz
 /mercurial-7.2.tar.gz
+/mercurial-7.2.1.tar.gz
 /mercurial-7.2.3.tar.gz

diff --git a/fix-compat-with-python315.patch b/fix-compat-with-python315.patch
new file mode 100644
index 0000000..8770c29
--- /dev/null
+++ b/fix-compat-with-python315.patch
@@ -0,0 +1,25 @@
+From a9faa827e7c686f92ddc53e87a057f554298ad10 Mon Sep 17 00:00:00 2001
+From: Karolina Surma <ksurma@redhat.com>
+Date: Thu, 21 May 2026 16:49:41 +0200
+Subject: [PATCH] Fix build with Python 3.15.0b1
+
+---
+ hgdemandimport/__init__.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hgdemandimport/__init__.py b/hgdemandimport/__init__.py
+index 206512a..f10c90b 100644
+--- a/hgdemandimport/__init__.py
++++ b/hgdemandimport/__init__.py
+@@ -69,6 +69,8 @@ IGNORES = {
+     'copy',
+     'difflib',
+     'decimal',
++    'tomllib._re',
++    'inspect',
+ }
+ 
+ _pypy = '__pypy__' in sys.builtin_module_names
+-- 
+2.54.0
+

diff --git a/mercurial.spec b/mercurial.spec
index fe15d98..1504238 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -23,6 +23,7 @@ Source0: https://www.mercurial-scm.org/release/%{name}-%{upstreamversion}.tar.gz
 Source1: mercurial-site-start.el
 # Patch cargo metadata for dependency versions available in Fedora
 Patch0:  mercurial-rust-metadata.patch
+Patch1:  fix-compat-with-python315.patch
 
 BuildRequires: make
 BuildRequires: emacs-el
@@ -282,6 +283,15 @@ rm -rf %{buildroot}%{python3_sitearch}/mercurial/locale
 * Mon Jun 29 2026 Mads Kiilerich <mads@kiilerich.com> - 7.2.3-1
 - mercurial 7.2.3
 
+* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 7.2.1-2
+- Rebuilt for Python 3.15
+
+* Sun Apr 05 2026 Mads Kiilerich <mads@kiilerich.com> - 7.2.1-1
+- mercurial 7.2.1
+
+* Fri Mar 20 2026 Lumír Balhar <lbalhar@redhat.com> - 7.2-2
+- Fix compatibility with Python 3.15 (rhbz#2447913)
+
 * Sat Jan 31 2026 Mads Kiilerich <mads@kiilerich.com> - 7.2-1
 - mercurial 7.2
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-29 20:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-29 20:37 [rpms/mercurial] rawhide: Merge branch 'f44' into rawhide Mads Kiilerich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox