Sync from SUSE:SLFO:Main mercurial revision b3dcfdb44e7ff2caa4edf29dd6664aee

mercurial-locale-path-fix.patch

@@ -1,12 +1,6 @@
----
- 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 @@
+--- a/mercurial/i18n.py
++++ b/mercurial/i18n.py
+@@ -58,7 +58,7 @@ if (
  
  
  datapath = pycompat.fsdecode(resourceutil.datapath)

mercurial-rpmlintrc

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

mercurial.changes

@@ -1,31 +1,3 @@
--------------------------------------------------------------------
-Thu Mar 20 18:21:19 UTC 2025 - Matej Cepl <mcepl@suse.com>
-
-- Clean up rpmlint issues
-
--------------------------------------------------------------------
-Wed Mar 19 20:27:59 UTC 2025 - Sean Baggaley <me@drinkybird.net>
-
-- Mercurial 6.9.4
-
-  * hgweb: fix XSS vulnerability in hgweb (CVE-2025-2361, bsc#1239685)
-
--------------------------------------------------------------------
-Wed Mar  5 22:29:56 UTC 2025 - Sean Baggaley <me@drinkybird.net>
-
-- Mercurial 6.9.3
-  out of schedule release to fix a regression introduced in 6.9.2
-
-  * fix processing of superfluous requirements specified for streamclone
-    in clone bundle manifest 
-
--------------------------------------------------------------------
-Fri Feb 28 22:31:43 UTC 2025 - Sean Baggaley <me@drinkybird.net>
-
-- Updated to use new build system via pyproject macros. This change
-  is required for the upcoming 7.0 release, which will remove support
-  for the old build method.
-
 -------------------------------------------------------------------
 Wed Feb 19 22:21:20 UTC 2025 - Sean Baggaley <me@drinkybird.net>
 

mercurial.spec

@@ -31,7 +31,7 @@
 %endif
 
 Name:           mercurial
-Version:        6.9.4
+Version:        6.9.2
 Release:        0
 Summary:        Scalable Distributed SCM
 License:        GPL-2.0-or-later
@@ -44,16 +44,18 @@ Patch0:         mercurial-hgk-path-fix.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
 Requires:       %{pprefix}-curses
 Requires:       %{pprefix}-xml
 Provides:       hg = %{version}
+%if 0%{?suse_version} < 1210
+BuildRequires:  docutils
+%else
 BuildRequires:  %{python_module docutils}
+%endif
 %if 0%{?sles_version}
 Requires:       openssl-certs
 %else
@@ -81,7 +83,6 @@ 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
@@ -94,17 +95,16 @@ This package contains its tests.
 %patch -P 0
 %patch -P 2 -p1
 
-find . -type f -exec sed -i -e '1{/#!/s/env //}' '{}' \;
+sed -i -e '1s@env @@' contrib/hgk
 
 chmod 644 hgweb.cgi
 
 %build
-%pyproject_wheel
+%make_build all PYTHON=%{expand:%%__%{pythons}}
 %make_build -C contrib/chg all
 
 %install
-%pyproject_install
-make -C doc install PREFIX="%{_prefix}" DESTDIR=%{buildroot} PYTHON=%{expand:%%__%{pythons}}
+make install PREFIX="%{_prefix}" DESTDIR=%{buildroot} PYTHON=%{expand:%%__%{pythons}}
 make -C contrib/chg install PREFIX="%{_prefix}" DESTDIR=%{buildroot}
 %{expand:%%%{pythons}_fix_shebang}
 
@@ -154,10 +154,6 @@ cp -a tests/. %{buildroot}%{_datadir}/mercurial/tests
 %{_mandir}/man5/hgignore.5%{?ext_man}
 %{_mandir}/man5/hgrc.5%{?ext_man}
 %{_mandir}/man8/hg-ssh.8%{?ext_man}
-%{python_sitearch}/hgdemandimport
-%{python_sitearch}/hgext
-%{python_sitearch}/hgext3rd
-%{python_sitearch}/mercurial
-%{python_sitearch}/mercurial-%{version}*-info
+%{python_sitearch}/*
 
 %changelog