rpms/mercurial
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't use old %{__python*} macros.

Browse Source
This commit is contained in:
Elliott Sales de Andrade 2020-06-17 03:26:22 -04:00
parent db91f16da3
commit a3033a7518
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mercurial.spec
View File

@ -138,8 +138,8 @@ Locales for mercurial.
cp -a hg hg2
cp -a hg hg3
rm hg
PYTHON=%{__python3} make all
PYTHON=%{__python2} make all
PYTHON=%{python3} make all
PYTHON=%{python2} make all
#TODO: Now just for Py2, version for Py3 will need probably more fixes
# in installer - and possibly some renames..
@ -150,8 +150,8 @@ popd
%install
# NOTE: this is nasty, but if we want to have parallel Py2/Py3 mercurial..
# ignoring now stuff related to *_completion, extensions
%{__python3} setup.py install -O1 --root %{buildroot} --prefix %{_prefix} --record=%{name}3.files
%{__python2} setup.py install -O1 --root %{buildroot} --prefix %{_prefix} --record=%{name}2.files
%{python3} setup.py install -O1 --root %{buildroot} --prefix %{_prefix} --record=%{name}3.files
%{python2} setup.py install -O1 --root %{buildroot} --prefix %{_prefix} --record=%{name}2.files
make install-doc DESTDIR=%{buildroot} MANDIR=%{_mandir}
grep -v -e 'hgk.py*' \
@ -230,8 +230,8 @@ grep -v locale %{name}3-base.files > %{name}3-base-filtered.files
cp -p %{buildroot}%{_bindir}/hg-ssh %{buildroot}%{_bindir}/hg-ssh2
cp -p %{buildroot}%{_bindir}/hg-ssh %{buildroot}%{_bindir}/hg-ssh3
rm %{buildroot}%{_bindir}/hg-ssh
pathfix.py -pni "%{__python2}" %{buildroot}%{_bindir}/hg-ssh2
pathfix.py -pni "%{__python3}" %{buildroot}%{_bindir}/hg-ssh3
pathfix.py -pni "%{python2}" %{buildroot}%{_bindir}/hg-ssh2
pathfix.py -pni "%{python3}" %{buildroot}%{_bindir}/hg-ssh3
# Touch the base executables for alternatives
@ -314,11 +314,11 @@ fi
#%%check
#cd tests && %%{__python2} run-tests.py
#cd tests && %%{python2} run-tests.py
# This will now fail everytime. Mercurial is not ported properly for Python3
# and current split of mercurial for Py2 and Py3 brings additional problems
# for extensions then pure Python3 packaging.
#cd tests && HGPYTHON3=1 %%{__python3} run-tests.py
#cd tests && HGPYTHON3=1 %%{python3} run-tests.py
%changelog