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

Remove redefine of python2_sitearch & python3_sitearch

Browse Source 
These two macros are defined in python[23]-devel so we do not need
to add conditional define of those macros anymore as they are always
defined.
This commit is contained in:
Petr Stodulka 2019-10-21 11:57:23 +02:00
parent 53899096c8
commit db951d39d2
No known key found for this signature in database
GPG Key ID: D4C17F0FB3B291C3
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mercurial.spec
View File

@ -1,6 +1,3 @@
%{!?python2_sitearch: %define python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python2_lib; print get_python2_lib(1)")}
%{!?python3_sitearch: %define python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python3_lib; print(get_python3_lib(1))")}
Summary: Mercurial -- a distributed SCM Summary: Mercurial -- a distributed SCM
Name: mercurial Name: mercurial
Version: 5.1.2 Version: 5.1.2
@ -169,10 +166,7 @@ cacerts = /etc/pki/tls/certs/ca-bundle.crt
EOF EOF
install -m 644 certs.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d install -m 644 certs.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
# NOTE: It looks that locales will have to be moved into the separate subpackage, # Despite the original path, locales can be used for Python3 as well
# despite the original path, locales should not be dependend on the version of
# python, so we can use one or the other for both mercurials
#mv $RPM_BUILD_ROOT%{python3_sitearch}/mercurial/locale $RPM_BUILD_ROOT%{_datadir}/locale
mv $RPM_BUILD_ROOT%{python2_sitearch}/mercurial/locale $RPM_BUILD_ROOT%{_datadir}/locale mv $RPM_BUILD_ROOT%{python2_sitearch}/mercurial/locale $RPM_BUILD_ROOT%{_datadir}/locale
rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/mercurial/locale rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/mercurial/locale
rm -rf $RPM_BUILD_ROOT%{python2_sitearch}/mercurial/locale rm -rf $RPM_BUILD_ROOT%{python2_sitearch}/mercurial/locale