Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2020-01-10 18:40:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial (Old) and /work/SRC/openSUSE:Factory/.mercurial.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial" Fri Jan 10 18:40:01 2020 rev:148 rq:761594 version:5.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2019-12-11 12:04:38.372752609 +0100 +++ /work/SRC/openSUSE:Factory/.mercurial.new.6675/mercurial.changes 2020-01-10 18:40:32.683494433 +0100 @@ -1,0 +2,7 @@ +Fri Jan 3 22:28:39 CET 2020 - Matej Cepl <[email protected]> + +- Switch Mercurial to Python 3 (it should be supported already, + according to https://www.mercurial-scm.org/wiki/Python3) +- Fix rpmlint warnings. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.nchNX3/_old 2020-01-10 18:40:33.455494724 +0100 +++ /var/tmp/diff_new_pack.nchNX3/_new 2020-01-10 18:40:33.455494724 +0100 @@ -1,7 +1,7 @@ # # spec file for package mercurial # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,19 +39,17 @@ # PATCH-FIX-OPENSUSE mercurial-4.8-python2-shebang.patch [email protected] sets shebang to python2 Patch3: mercurial-4.8-python2-shebang.patch BuildRequires: fdupes -BuildRequires: python-devel -BuildRequires: python-xml -Requires: python-curses -Requires: python-openssl -Requires: python-xml -Requires: python(abi) < 3.0 -Requires: python(abi) >= 2.7 +BuildRequires: python3 +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-docutils +BuildRequires: python3-docutils %endif %if 0%{?sles_version} Requires: openssl-certs @@ -64,8 +62,7 @@ BuildRequires: git BuildRequires: gpg BuildRequires: ncurses-devel -BuildRequires: python-Pygments -BuildRequires: python-openssl +BuildRequires: python3-Pygments BuildRequires: subversion-python BuildRequires: unzip #BuildRequires: python-pyflakes @@ -84,24 +81,26 @@ %patch1 %endif %patch2 -p1 -%patch3 -p0 +%patch3 + +sed -i -e '1s@env @@' contrib/hgk chmod 644 hgweb.cgi %build -make %{?_smp_mflags} all +make %{?_smp_mflags} all PYTHON=python3 %install -make install PREFIX="%{_prefix}" DESTDIR=%{buildroot} +make install PREFIX="%{_prefix}" DESTDIR=%{buildroot} PYTHON=python3 # 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 install -m0755 contrib/hgk %{buildroot}%{_bindir} -install -Dm0644 contrib/bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/mercurial.sh +install -Dm0644 contrib/bash_completion %{buildroot}%{_datadir}/bash-completion/completions/mercurial.sh install -Dm0644 contrib/zsh_completion %{buildroot}%{_datadir}/zsh/site-functions/_mercurial mkdir -p %{buildroot}%{_datadir}/{x,}emacs/site-lisp install -m0644 contrib/*.el %{buildroot}%{_datadir}/emacs/site-lisp @@ -111,7 +110,7 @@ %if 0%{?with_tests} %check -make %{?_smp_mflags} tests TESTFLAGS="-v --blacklist=%{SOURCE90}" +make %{?_smp_mflags} tests TESTFLAGS="-v --blacklist=%{SOURCE90}" PYTHON=python3 %endif %files lang -f hg.lang @@ -120,7 +119,7 @@ %license COPYING %doc README.rst CONTRIBUTORS hgweb.cgi %{_bindir}/* -%{_sysconfdir}/bash_completion.d/* +%{_datadir}/bash-completion/completions/* %{_datadir}/zsh/ %dir %{_sysconfdir}/mercurial %dir %{_sysconfdir}/mercurial/hgrc.d @@ -131,6 +130,6 @@ %{_mandir}/man5/hgignore.5%{?ext_man} %{_mandir}/man5/hgrc.5%{?ext_man} %{_mandir}/man8/hg-ssh.8%{?ext_man} -%{python_sitearch}/* +%{python3_sitearch}/* %changelog
