diff --git a/mercurial.spec b/mercurial.spec index 696fd6e..395c041 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -1,7 +1,7 @@ Summary: Mercurial -- a distributed SCM Name: mercurial Version: 5.6.1 -Release: 2%{?dist} +Release: 3%{?dist} # Release: 1.rc1%%{?dist} @@ -156,11 +156,15 @@ make install-doc DESTDIR=%{buildroot} MANDIR=%{_mandir} grep -v -e 'hgk.py*' \ -e "%{python3_sitearch}/mercurial/" \ -e "%{python3_sitearch}/hgext/" \ + -e "%{python3_sitearch}/hgext3rd/" \ + -e "%{python3_sitearch}/hgdemandimport/" \ -e "%{_bindir}" \ < %{name}3.files > %{name}3-base.files grep -v -e 'hgk.py*' \ -e "%{python2_sitearch}/mercurial/" \ -e "%{python2_sitearch}/hgext/" \ + -e "%{python2_sitearch}/hgext3rd/" \ + -e "%{python2_sitearch}/hgdemandimport/" \ -e "%{_bindir}" \ < %{name}2.files > %{name}2-base.files grep 'hgk.py*' < %{name}3.files > %{name}3-hgk.files @@ -281,6 +285,8 @@ fi %{_datadir}/zsh/site-functions/_mercurial %{python2_sitearch}/mercurial/ %{python2_sitearch}/hgext/ +%{python2_sitearch}/hgext3rd/ +%{python2_sitearch}/hgdemandimport/ %{_emacs_sitelispdir}/mercurial %{_emacs_sitestartdir}/*.el %ghost %{_bindir}/hg @@ -302,6 +308,8 @@ fi %{_datadir}/zsh/site-functions/_mercurial %{python3_sitearch}/mercurial/ %{python3_sitearch}/hgext/ +%{python3_sitearch}/hgext3rd/ +%{python3_sitearch}/hgdemandimport/ %{_emacs_sitelispdir}/mercurial %{_emacs_sitestartdir}/*.el %ghost %{_bindir}/hg @@ -331,6 +339,9 @@ fi %changelog +* Sat Dec 5 14:50:30 CET 2020 Mads Kiilerich - 5.6.1-3 +- Fix ownership of hgext3rd and hgdemandimport (#1897681) + * Thu Dec 3 21:24:26 CET 2020 Mads Kiilerich - 5.6.1-2 - Drop hgdemandimport_ast.patch - it has been fixed both in Mercurial 5.5.2 and Python 3.9.0rc2