hg-evolve-11.1.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:629876836e787d29cf55f8269267914aa966b147c780ffb0a8dd061cb215ff07
+size 861472

hg-evolve-11.1.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26e9f58196195eff27b890676deacad5b7133d32c20e0186779e3739e38454eb
-size 864773

mercurial-extension-hg-evolve.changes

@@ -1,38 +1,3 @@
--------------------------------------------------------------------
-Sun Dec  1 22:02:39 UTC 2024 - Lukas Müller <expeehaa@outlook.com>
-
-- Reenable test "test-evolve-templates.t".
-
--------------------------------------------------------------------
-Sat Nov 30 21:56:34 UTC 2024 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
-
-- Update to version 11.1.6.
-  * evolve: unrelated parts of splits are no longer considered
-    content-divergent, this is a port of an upstream patch included in hg 6.8.2
-  * obshashrange: avoid executing too many DELETE requests at once
-  * obshashrange: reset the cache if too many ranges need to be deleted
-  topic (1.1.6)
-  * stack: when stack base is obsolete, pick any successor, even if at random
-
--------------------------------------------------------------------
-Thu Nov  7 14:22:51 UTC 2024 - Lukas Müller <expeehaa@outlook.com>
-
-- Update to version 11.1.5.
-  * compatibility with Mercurial 6.9
-  * evolve: check that the evolved revisions are indeed in the repo during
-    abort, fixes an issue when trying to access them during cleanup step
-  * docs: update installation instructions due to PEP 668
-  * docs: minor edits and fixes in evolve and topic tutorials
-  * tests: more tests related to Python packaging
-  topic (1.1.5)
-  * compatibility with Mercurial 6.9
-- Temporarily disable test "test-evolve-templates.t".
-
--------------------------------------------------------------------
-Thu Sep 12 18:05:51 UTC 2024 - Lukas Müller <expeehaa@outlook.com>
-
-- Use existing python RPM macros instead of defining custom ones.
-
 -------------------------------------------------------------------
 Thu Jul 11 18:30:16 UTC 2024 - Lukas Müller <expeehaa@outlook.com>
 

mercurial-extension-hg-evolve.spec

@@ -18,17 +18,26 @@
 
 %if 0%{?suse_version} > 1600
 # Tumbleweed
-%define pythons python3
+%define pythons                     python3
+%define mercurial_python            python3
+%define mercurial_python_executable python3
 %else
 %if 0%{?sle_version} >= 150600
 %{?sle15_python_module_pythons}
+# Leap 15.6
+%if %pythons == "python311"
+%define mercurial_python            python311
+%define mercurial_python_executable python3.11
+%endif
 %else
-%define pythons python3
+%define pythons                     python3
+%define mercurial_python            python3
+%define mercurial_python_executable python3
 %endif
 %endif
 
 Name:           mercurial-extension-hg-evolve
-Version:        11.1.6
+Version:        11.1.4
 Release:        0
 Summary:        Flexible evolution of Mercurial history
 License:        GPL-2.0-or-later
@@ -36,13 +45,13 @@ Group:          Development/Tools/Version Control
 URL:            https://www.mercurial-scm.org/doc/evolution/
 Source0:        https://files.pythonhosted.org/packages/source/h/hg-evolve/hg-evolve-%{version}.tar.gz
 Source90:       tests.blacklist
-BuildRequires:  %{pythons}
+BuildRequires:  %{mercurial_python}
 # python311-flake8 is not available on Leap 15.6.
 %if 0%{?suse_version} > 1600 || 0%{?sle_version} < 150600
-BuildRequires:  %{python_module flake8}
+BuildRequires:  %{mercurial_python}-flake8
 %endif
-BuildRequires:  %{python_module pyflakes}
-BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{mercurial_python}-pyflakes
+BuildRequires:  %{mercurial_python}-setuptools
 BuildRequires:  fdupes
 BuildRequires:  mercurial
 BuildRequires:  mercurial-tests
@@ -71,7 +80,7 @@ rm %{buildroot}%{python_sitelib}/hgext3rd/__pycache__/__init__*.pyc
 
 %check
 cd tests
-%python_exec %{_datadir}/mercurial/tests/run-tests.py --with-hg=%{_bindir}/hg --blacklist=%{SOURCE90}
+%{mercurial_python_executable} %{_datadir}/mercurial/tests/run-tests.py --with-hg=%{_bindir}/hg --blacklist=%{SOURCE90}
 
 %files
 %doc CHANGELOG README.rst