diff --git a/mercurial-6.9.1.tar.gz b/mercurial-7.0.2.tar.gz similarity index 32% rename from mercurial-6.9.1.tar.gz rename to mercurial-7.0.2.tar.gz index e1fed2c3b903191488c7098c6c324269ae381018..7345d48125b24b7f18d8e19fac1612a59c12b742 100644 --- a/mercurial-6.9.1.tar.gz +++ b/mercurial-7.0.2.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e577577ee9a97a9f84d3c34d53ccb8b9354263d6ab96447525094f3e0a567270 -size 8664016 +oid sha256:f7731f1b42acaeaacb8cf7e41c0a472a7aa31a8f47e518baea735f1cb2987e0c +size 8981974 diff --git a/mercurial-site-start.el b/mercurial-site-start.el new file mode 100644 index 0000000000000000000000000000000000000000..f169f95a9a6ea5706d213e909a76e8698aca05c8 --- /dev/null +++ b/mercurial-site-start.el @@ -0,0 +1,7 @@ +(autoload 'hg-mode "mercurial" "HG mode." t) +(autoload 'hg-help-overview "mercurial" "HG help." t) + +(autoload 'mq-mode "mq" + "MQ mode for Mercurial repositories with an MQ patch queue." t) +(autoload 'mq-edit-mode "mq" + "MQ edit mode for editing patch descriptions." t) diff --git a/mercurial.spec b/mercurial.spec index fe97817bd7c90998caefe74f075937972a957fbb..b30c180273e83ef5c01e59fa0e55f4c263db3614 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -1,13 +1,24 @@ Name: mercurial -Version: 6.9.1 +Version: 7.0.2 Release: 1 Summary: Source control management tool License: GPL-2.0-or-later URL: https://www.selenic.com/mercurial/ Source0: https://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz - -BuildRequires: gcc python3 python3-devel emacs-nox emacs-el pkgconfig gettext python3-docutils -Requires: python3 emacs-filesystem tk +Source1: mercurial-site-start.el + +BuildRequires: make +BuildRequires: emacs-el +BuildRequires: emacs-nox +BuildRequires: gcc +BuildRequires: gettext +BuildRequires: pkgconfig +BuildRequires: python3-build +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-setuptools_scm +BuildRequires: python3-docutils +Requires: python3 emacs-filesystem tk Provides: hg = %{version}-%{release} emacs-mercurial <= 3.4.1 emacs-mercurial-el <= 3.4.1 Provides: mercurial-hgk mercurial-chg Obsoletes: emacs-mercurial <= 3.4.1 emacs-mercurial-el <= 3.4.1 @@ -26,28 +37,19 @@ It efficiently handles projects of any size and offers an easy and intuitive int sed -i 's|python|python3|' %{_builddir}/%{name}-%{version}/Makefile %build -%make_build +%py3_build pushd contrib/chg make popd -%install -%{__python3} setup.py install -O1 --root %{buildroot} --prefix %{_prefix} --record=%{name}.files +%install\ +%py3_install make install-doc DESTDIR=%{buildroot} MANDIR=%{_mandir} -grep -v -e 'hgk.py*' -e %{python3_sitearch}/mercurial/ -e %{python3_sitearch}/hgext/ < %{name}.files > %{name}-base.files -grep 'hgk.py*' < %{name}.files > %{name}-hgk.files - install -D -m 755 contrib/hgk %{buildroot}%{_libexecdir}/mercurial/hgk install -m 755 contrib/hg-ssh %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{bash_completions_dir} -install -m 644 contrib/bash_completion %{buildroot}%{bash_completions_dir}/hg - -mkdir -p %{buildroot}%{zsh_completions_dir} -install -m 644 contrib/zsh_completion %{buildroot}%{zsh_completions_dir}/_mercurial - mkdir -p %{buildroot}%{_emacs_sitelispdir}/mercurial pushd contrib @@ -60,13 +62,12 @@ done popd pushd contrib/chg -make install DESTDIR=%{buildroot} PREFIX=%{_usr} MANDIR=%{_mandir}/man1 +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} MANDIR=%{_mandir}/man1 popd -mkdir -p %{buildroot}/%{_sysconfdir}/mercurial/hgrc.d +mkdir -p %{buildroot}%{_sysconfdir}/mercurial/hgrc.d -touch mercurial-site-start.el -mkdir -p %{buildroot}%{_emacs_sitestartdir} && install -m644 mercurial-site-start.el %{buildroot}%{_emacs_sitestartdir} +mkdir -p %{buildroot}%{_emacs_sitestartdir} && install -m644 %SOURCE1 %{buildroot}%{_emacs_sitestartdir} cat >hgk.rc < certs.rc < %{name}-base-filtered.files - -%files -f %{name}-base-filtered.files -f hg.lang -%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi contrib/*.wsgi contrib/*.svg -%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/certs.rc -%{_sysconfdir}/mercurial/hgrc.d/hgk.rc +%files -f hg.lang +%doc %attr(644,root,root) contrib/*.svg %dir %{_sysconfdir}/mercurial %dir %{_sysconfdir}/mercurial/hgrc.d -%{_bindir}/hg-ssh -%{_bindir}/chg -%{bash_completions_dir}/* -%{zsh_completions_dir}/* -%{_libexecdir}/mercurial/ -%{python3_sitearch}/mercurial -%{python3_sitearch}/hgext +%{bash_completions_dir}/hg +%{zsh_completions_dir}/_hg +%{python3_sitearch}/mercurial-%{version}-py%{python3_version}.egg-info/ +%{python3_sitearch}/mercurial/ +%{python3_sitearch}/hgext/ +%{python3_sitearch}/hgext3rd/ +%{python3_sitearch}/hgdemandimport/ %{_emacs_sitelispdir}/mercurial %{_emacs_sitestartdir}/*.el +%{_bindir}/hg +%{_bindir}/hg-ssh + +%{_libexecdir}/mercurial/ +%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/hgk.rc + +%{_bindir}/chg %files help -%attr(644,root,root) %{_mandir}/man?/* %changelog +* Wed May 07 2025 Funda Wang - 7.0.2-1 +- update to 7.0.2 + * Fri Jan 17 2025 Funda Wang - 6.9.1-1 - update to 6.9.1