Define %{pypylibdir} for easier %files

This commit is contained in:
Miro Hrončok 2022-02-09 17:52:43 +01:00
parent 70c239aa70
commit c6e52d457c

View File

@ -429,6 +429,8 @@ BuildPyPy \
%install %install
%global pypylibdir %{_libdir}/pypy%{pyversion}
# First, run packaging script, it will prep the installation tree in builddir # First, run packaging script, it will prep the installation tree in builddir
%global installation_archive_name pypy%{pyversion}-%{version_} %global installation_archive_name pypy%{pyversion}-%{version_}
%global packaging_builddir builddir %global packaging_builddir builddir
@ -463,7 +465,7 @@ mv %{packaged_prefix}/include %{buildroot}%{_includedir}
mv %{packaged_prefix}/%{_lib} %{buildroot}%{_libdir} mv %{packaged_prefix}/%{_lib} %{buildroot}%{_libdir}
# Create directories we want to own # Create directories we want to own
install -d -m 0755 %{buildroot}%{_libdir}/pypy%{pyversion}/site-packages/__pycache__ install -d -m 0755 %{buildroot}%{pypylibdir}/site-packages/__pycache__
%if "%{_lib}" == "lib64" %if "%{_lib}" == "lib64"
# The 64-bit version needs to create "site-packages" in /usr/lib/ (for # The 64-bit version needs to create "site-packages" in /usr/lib/ (for
# pure-Python modules) as well as in /usr/lib64/ (for packages with extension # pure-Python modules) as well as in /usr/lib64/ (for packages with extension
@ -713,12 +715,12 @@ CheckPyPy pypy%{pyversion}-c
%files libs %files libs
%doc README.rst %doc README.rst
%license %{_libdir}/pypy%{pyversion}/LICENSE %license %{pypylibdir}/LICENSE
%license %{_libdir}/pypy%{pyversion}/_cffi_ssl/LICENSE %license %{pypylibdir}/_cffi_ssl/LICENSE
%license %{_libdir}/pypy%{pyversion}/cffi.dist-info/LICENSE %license %{pypylibdir}/cffi.dist-info/LICENSE
%license %{_libdir}/pypy%{pyversion}/cffi/_pycparser/ply/LICENSE %license %{pypylibdir}/cffi/_pycparser/ply/LICENSE
%license %{_libdir}/pypy%{pyversion}/hpy.dist-info/LICENSE %license %{pypylibdir}/hpy.dist-info/LICENSE
%{_libdir}/pypy%{pyversion}/ %{pypylibdir}/
%if "%{_lib}" == "lib64" %if "%{_lib}" == "lib64"
%{_prefix}/lib/pypy%{pyversion}/ %{_prefix}/lib/pypy%{pyversion}/
%endif %endif