Sync from SUSE:SLFO:1.1 mercurial revision 5df8eda1ad70eb124f7b3c8d9c22b634

mercurial-docutils-compat.diff

@@ -0,0 +1,11 @@
+--- 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.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mercurial
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,11 @@
 #
 
 
-%if 0%{?suse_version} > 1600
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-# Tumbleweed
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%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.9.2
+Version:        6.4.3
 Release:        0
 Summary:        Scalable Distributed SCM
 License:        GPL-2.0-or-later
@@ -41,20 +30,22 @@ 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 setuptools}
-BuildRequires:  %{python_module xml}
-BuildRequires:  %{pythons}
 BuildRequires:  fdupes
-Requires:       %{pprefix}-curses
+BuildRequires:  python3
-Requires:       %{pprefix}-xml
+BuildRequires:  python3-devel
+BuildRequires:  python3-xml
+Requires:       python3-curses
+Requires:       python3-xml
+Recommends:     %{name}-lang
 Provides:       hg = %{version}
 %if 0%{?suse_version} < 1210
 BuildRequires:  docutils
 %else
-BuildRequires:  %{python_module docutils}
+BuildRequires:  python3-docutils
 %endif
 %if 0%{?sles_version}
 Requires:       openssl-certs
@@ -63,11 +54,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
@@ -92,25 +83,27 @@ This package contains its tests.
 
 %prep
 %setup -q
-%patch -P 0
+%patch0
-%patch -P 2 -p1
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%patch1
+%endif
+%patch2 -p1
 
 sed -i -e '1s@env @@' contrib/hgk
 
 chmod 644 hgweb.cgi
 
 %build
-%make_build all PYTHON=%{expand:%%__%{pythons}}
+%make_build all PYTHON=python3
 %make_build -C contrib/chg all
 
 %install
-make install PREFIX="%{_prefix}" DESTDIR=%{buildroot} PYTHON=%{expand:%%__%{pythons}}
+make install PREFIX="%{_prefix}" DESTDIR=%{buildroot} PYTHON=python3
 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}%{python_sitearch}/mercurial/locale/* %{buildroot}%{_datadir}/locale
+mv %{buildroot}%{python3_sitearch}/mercurial/locale/* %{buildroot}%{_datadir}/locale
 %find_lang hg
 
 # Install stuff in contrib
@@ -128,7 +121,7 @@ cp -a tests/. %{buildroot}%{_datadir}/mercurial/tests
 
 %if 0%{?with_tests}
 %check
-%make_build tests TESTFLAGS="-v --blacklist=%{SOURCE90}" PYTHON=%{expand:%%__%{pythons}}
+%make_build tests TESTFLAGS="-v --blacklist=%{SOURCE90}" PYTHON=python3
 %endif
 
 %files lang -f hg.lang
@@ -149,11 +142,10 @@ 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}
-%{python_sitearch}/*
+%{python3_sitearch}/*
 
 %changelog