Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mercurial for openSUSE:Factory
checked in at 2024-09-15 12:33:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mercurial (Old)
and /work/SRC/openSUSE:Factory/.mercurial.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial"
Sun Sep 15 12:33:11 2024 rev:204 rq:1200801 version:6.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2024-08-07
09:15:04.359923050 +0200
+++ /work/SRC/openSUSE:Factory/.mercurial.new.29891/mercurial.changes
2024-09-15 12:33:49.126067140 +0200
@@ -1,0 +2,7 @@
+Thu Sep 12 18:42:18 UTC 2024 - Lukas Müller <expee...@outlook.com>
+
+- Use existing python RPM macros instead of custom ones.
+- Remove mercurial-docutils-compat.diff.
+- Remove checks for obsolete SUSE version.
+
+-------------------------------------------------------------------
Old:
----
mercurial-docutils-compat.diff
BETA DEBUG BEGIN:
Old:- Use existing python RPM macros instead of custom ones.
- Remove mercurial-docutils-compat.diff.
- Remove checks for obsolete SUSE version.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mercurial.spec ++++++
--- /var/tmp/diff_new_pack.VPIou7/_old 2024-09-15 12:33:49.962101774 +0200
+++ /var/tmp/diff_new_pack.VPIou7/_new 2024-09-15 12:33:49.966101941 +0200
@@ -16,30 +16,14 @@
#
-%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()")}
-%endif
-
%if 0%{?suse_version} > 1600
# Tumbleweed
%define pythons python3
-%define mercurial_python python3
-%define mercurial_python_executable python3
-%define mercurial_python_fix_shebang() %python3_fix_shebang
%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
-%define mercurial_python_fix_shebang() %python311_fix_shebang
-%endif
%else
%define pythons python3
-%define mercurial_python python3
-%define mercurial_python_executable python3
-%define mercurial_python_fix_shebang() %python3_fix_shebang
%endif
%endif
@@ -54,21 +38,19 @@
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 sasc...@suse.de --
locales are found in /usr/share/locale
Patch2: mercurial-locale-path-fix.patch
-BuildRequires: %{mercurial_python}
-BuildRequires: %{mercurial_python}-devel
-BuildRequires: %{mercurial_python}-xml
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module xml}
+BuildRequires: %{pythons}
BuildRequires: fdupes
-Requires: %{mercurial_python}-curses
-Requires: %{mercurial_python}-xml
+Requires: %{python_module curses}
+Requires: %{python_module xml}
Provides: hg = %{version}
%if 0%{?suse_version} < 1210
BuildRequires: docutils
%else
-BuildRequires: %{mercurial_python}-docutils
+BuildRequires: %{python_module docutils}
%endif
%if 0%{?sles_version}
Requires: openssl-certs
@@ -77,7 +59,7 @@
%endif
%if 0%{?with_tests}
Source90: tests.blacklist
-BuildRequires: %{mercurial_python}-Pygments
+BuildRequires: %{python_module Pygments}
BuildRequires: bzr
BuildRequires: git
BuildRequires: gpg
@@ -107,9 +89,6 @@
%prep
%setup -q
%patch -P 0
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%patch -P 1
-%endif
%patch -P 2 -p1
sed -i -e '1s@env @@' contrib/hgk
@@ -117,13 +96,13 @@
chmod 644 hgweb.cgi
%build
-%make_build all PYTHON=%{mercurial_python_executable}
+%make_build all PYTHON=%{expand:%%__%{pythons}}
%make_build -C contrib/chg all
%install
-make install PREFIX="%{_prefix}" DESTDIR=%{buildroot}
PYTHON=%{mercurial_python_executable}
+make install PREFIX="%{_prefix}" DESTDIR=%{buildroot}
PYTHON=%{expand:%%__%{pythons}}
make -C contrib/chg install PREFIX="%{_prefix}" DESTDIR=%{buildroot}
-%mercurial_python_fix_shebang
+%{expand:%%%{pythons}_fix_shebang}
# Move locales to proper location
mkdir -p %{buildroot}%{_datadir}/locale
@@ -145,7 +124,7 @@
%if 0%{?with_tests}
%check
-%make_build tests TESTFLAGS="-v --blacklist=%{SOURCE90}"
PYTHON=%{mercurial_python_executable}
+%make_build tests TESTFLAGS="-v --blacklist=%{SOURCE90}"
PYTHON=%{expand:%%__%{pythons}}
%endif
%files lang -f hg.lang
