Mercurial > public > mercurial-scm > hg-stable
changeset 52966:d24d57733e6b
packaging: fix rpm docutils dependency
| author | Mathias De Mare <mathias.de_mare@nokia.com> |
|---|---|
| date | Tue, 11 Feb 2025 15:03:04 +0100 |
| parents | 4ea7c868de4b |
| children | 0db1273b528a |
| files | contrib/packaging/mercurial.spec |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/packaging/mercurial.spec Tue Feb 11 15:02:48 2025 +0100 +++ b/contrib/packaging/mercurial.spec Tue Feb 11 15:03:04 2025 +0100 @@ -83,6 +83,7 @@ # verify Python environment LD_LIBRARY_PATH=$PYPATH PYTHONPATH=$PWD/%{docutilsname} $PYTHON_FULLPATH -c 'import sys, zlib, bz2, ssl, curses, readline' LD_LIBRARY_PATH=$PYPATH PYTHONPATH=$PWD/%{docutilsname} $PYTHON_FULLPATH -c "import ssl; print(ssl.HAS_TLSv1_2)" +LD_LIBRARY_PATH=$PYPATH PYTHONPATH=$PWD/%{docutilsname} $PYTHON_FULLPATH -c "import docutils" # set environment for make export PATH=$PYPATH:$PATH @@ -117,7 +118,7 @@ $PYTHON_FULLPATH -m pip install . --root="$RPM_BUILD_ROOT" cd - -PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=$PYTHON_FULLPATH DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT/%{hgpyprefix} MANDIR=%{_mandir} PURE="--rust" +PYTHONPATH=$PWD/%{docutilsname} PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=$PYTHON_FULLPATH DESTDIR=$RPM_BUILD_ROOT PIP_PREFIX=$RPM_BUILD_ROOT/%{hgpyprefix} PREFIX=$RPM_BUILD_ROOT/%{hgpyprefix} MANDIR=%{_mandir} PURE="--rust" mkdir -p $RPM_BUILD_ROOT%{_bindir} ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/hg . ) ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/python2.? %{pythonhg} )