Sync from SUSE:SLFO:Main mercurial revision cc2bda817c1f843c1484d759e7d7e160

mercurial-docutils-compat.diff

@@ -1,11 +0,0 @@
---- doc/Makefile.orig	2011-03-09 13:05:17.000000000 +0100
-+++ doc/Makefile	2011-03-09 13:06:03.000000000 +0100
-@@ -27,7 +27,7 @@
- 
- %: %.txt %.gendoc.txt common.txt
- 	$(PYTHON) runrst hgmanpage $(RSTARGS) --halt warning \
--	  --strip-elements-with-class htmlonly $*.txt $*
-+	  $*.txt $*
- 
- %.html: %.txt %.gendoc.txt common.txt
- 	$(PYTHON) runrst html $(RSTARGS) --halt warning \

mercurial-locale-path-fix.patch

@@ -1,6 +1,12 @@
---- a/mercurial/i18n.py
-+++ b/mercurial/i18n.py
-@@ -58,7 +58,7 @@ if (
+---
+ mercurial/i18n.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: mercurial-6.9.4/mercurial/i18n.py
+===================================================================
+--- mercurial-6.9.4.orig/mercurial/i18n.py	2025-03-20 19:18:38.520490391 +0100
++++ mercurial-6.9.4/mercurial/i18n.py	2025-03-20 19:18:43.941863826 +0100
+@@ -55,7 +55,7 @@
  
  
  datapath = pycompat.fsdecode(resourceutil.datapath)

mercurial-rpmlintrc

@@ -1 +1,2 @@
-addFilter("python-naming-policy-not-applied")
+addFilter("zero-length.*/tests/test-check-interfaces.py.out")
+addFilter("hidden-file-or-dir.*/tests/.balto.toml")

mercurial.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mercurial
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,22 @@
 #
 
 
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if 0%{?suse_version} > 1600
+# Tumbleweed
+%define pythons python3
+%global pprefix python3
+%else
+%if 0%{?sle_version} >= 150600
+%{?sle15_python_module_pythons}
+%global pprefix python311
+%else
+%define pythons python3
+%global pprefix python3
 %endif
+%endif
+
 Name:           mercurial
-Version:        6.4.3
+Version:        6.9.4
 Release:        0
 Summary:        Scalable Distributed SCM
 License:        GPL-2.0-or-later
@@ -30,23 +41,19 @@ Source:         https://www.mercurial-scm.org/release/mercurial-%{version}.tar.g
 Source1:        cacerts.rc
 Source99:       mercurial-rpmlintrc
 Patch0:         mercurial-hgk-path-fix.diff
-# PATCH-FIX-OPENSUSE mercurial-docutils-compat.diff -- Fix for new docutils options not available on 11.1 and older
-Patch1:         mercurial-docutils-compat.diff
 # PATCH-FIX-OPENSUSE mercurial-locale-path-fix.patch saschpe@suse.de -- locales are found in /usr/share/locale
 Patch2:         mercurial-locale-path-fix.patch
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
+BuildRequires:  %{python_module xml}
+BuildRequires:  %{pythons}
 BuildRequires:  fdupes
-BuildRequires:  python3
-BuildRequires:  python3-devel
-BuildRequires:  python3-xml
-Requires:       python3-curses
-Requires:       python3-xml
-Recommends:     %{name}-lang
+Requires:       %{pprefix}-curses
+Requires:       %{pprefix}-xml
 Provides:       hg = %{version}
-%if 0%{?suse_version} < 1210
-BuildRequires:  docutils
-%else
-BuildRequires:  python3-docutils
-%endif
+BuildRequires:  %{python_module docutils}
 %if 0%{?sles_version}
 Requires:       openssl-certs
 %else
@@ -54,11 +61,11 @@ Requires:       ca-certificates
 %endif
 %if 0%{?with_tests}
 Source90:       tests.blacklist
+BuildRequires:  %{python_module Pygments}
 BuildRequires:  bzr
 BuildRequires:  git
 BuildRequires:  gpg
 BuildRequires:  ncurses-devel
-BuildRequires:  python3-Pygments
 BuildRequires:  subversion-python
 BuildRequires:  unzip
 #BuildRequires:  python-pyflakes
@@ -74,6 +81,7 @@ designed for efficient handling of very large distributed projects.
 Summary:        Mercurial tests
 Group:          Development/Tools/Version Control
 Requires:       %{name} = %{version}
+BuildArch:      noarch
 
 %description tests
 Mercurial is a fast, lightweight source control management system
@@ -83,27 +91,26 @@ This package contains its tests.
 
 %prep
 %setup -q
-%patch0
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%patch1
-%endif
-%patch2 -p1
+%patch -P 0
+%patch -P 2 -p1
 
-sed -i -e '1s@env @@' contrib/hgk
+find . -type f -exec sed -i -e '1{/#!/s/env //}' '{}' \;
 
 chmod 644 hgweb.cgi
 
 %build
-%make_build all PYTHON=python3
+%pyproject_wheel
 %make_build -C contrib/chg all
 
 %install
-make install PREFIX="%{_prefix}" DESTDIR=%{buildroot} PYTHON=python3
+%pyproject_install
+make -C doc install PREFIX="%{_prefix}" DESTDIR=%{buildroot} PYTHON=%{expand:%%__%{pythons}}
 make -C contrib/chg install PREFIX="%{_prefix}" DESTDIR=%{buildroot}
+%{expand:%%%{pythons}_fix_shebang}
 
 # Move locales to proper location
 mkdir -p %{buildroot}%{_datadir}/locale
-mv %{buildroot}%{python3_sitearch}/mercurial/locale/* %{buildroot}%{_datadir}/locale
+mv %{buildroot}%{python_sitearch}/mercurial/locale/* %{buildroot}%{_datadir}/locale
 %find_lang hg
 
 # Install stuff in contrib
@@ -121,7 +128,7 @@ cp -a tests/. %{buildroot}%{_datadir}/mercurial/tests
 
 %if 0%{?with_tests}
 %check
-%make_build tests TESTFLAGS="-v --blacklist=%{SOURCE90}" PYTHON=python3
+%make_build tests TESTFLAGS="-v --blacklist=%{SOURCE90}" PYTHON=%{expand:%%__%{pythons}}
 %endif
 
 %files lang -f hg.lang
@@ -142,10 +149,15 @@ cp -a tests/. %{buildroot}%{_datadir}/mercurial/tests
 %{_datadir}/emacs
 %{_datadir}/xemacs
 %{_mandir}/man1/hg.1%{?ext_man}
+%{_mandir}/man1/hg-*.1%{?ext_man}
 %{_mandir}/man1/chg.1%{?ext_man}
 %{_mandir}/man5/hgignore.5%{?ext_man}
 %{_mandir}/man5/hgrc.5%{?ext_man}
 %{_mandir}/man8/hg-ssh.8%{?ext_man}
-%{python3_sitearch}/*
+%{python_sitearch}/hgdemandimport
+%{python_sitearch}/hgext
+%{python_sitearch}/hgext3rd
+%{python_sitearch}/mercurial
+%{python_sitearch}/mercurial-%{version}*-info
 
 %changelog