SHA256
1
0
forked from pool/python38

Accepting request 869854 from home:bnavigator:branches:devel:languages:python:Factory

- Provide %have_<flavor> for all python flavors
  gh#openSUSE/python-rpm-macros#96
- Add %python3_default and %default_python3 for the primary python3
  flavor

OBS-URL: https://build.opensuse.org/request/show/869854
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python38?expand=0&rev=49
This commit is contained in:
Matej Cepl 2021-02-05 23:09:58 +00:00 committed by Git OBS Bridge
parent 2b9c6ad870
commit eecd8bd4f8
3 changed files with 20 additions and 3 deletions

View File

@ -1,3 +1,4 @@
# macros for the primary python3 providing python flavor
%have_python3 1
# commented out legacy macro definitions
@ -25,4 +26,5 @@ find %1 -name '*.pyo' -exec rm -f {} ";"\
python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1\
}
%python3_default %(s=$(rpm -qf /usr/bin/python3); echo ${s%%%%-*})
%default_python3 %(s=$(rpm -qf /usr/bin/python3); echo ${s%%%%-*})

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Feb 5 15:35:29 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Provide %have_<flavor> for all python flavors
gh#openSUSE/python-rpm-macros#96
- Add %python3_default and %default_python3 for the primary python3
flavor
-------------------------------------------------------------------
Fri Jan 29 17:22:48 UTC 2021 - Matej Cepl <mcepl@suse.com>

View File

@ -1,5 +1,5 @@
#
# spec file for package python38-core
# spec file for package python38
#
# Copyright (c) 2021 SUSE LLC
#
@ -698,10 +698,16 @@ install -m 755 -D Tools/gdb/libpython.py %{buildroot}%{_datadir}/gdb/auto-load/%
#cp Makefile Makefile.pre.in Makefile.pre $RPM_BUILD_ROOT%{sitedir}/config-%{python_abi}/
# RPM macros
%if %{primary_interpreter}
mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
# primary python3 macros
%if %{primary_interpreter}
install -m 644 %{SOURCE7} %{buildroot}%{_rpmconfigdir}/macros.d/ # macros.python3
%endif
# flavor specific macros, only to be supplied "if we are in the buildset", e.g. installed.
echo '
# macros for the %{python_pkg_name} flavor
%%have_%{python_pkg_name} 1
' > %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{python_pkg_name}
# import_failed hooks
FAILDIR=%{buildroot}/%{sitedir}/_import_failed
@ -860,6 +866,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo
%if %{primary_interpreter}
%{_rpmconfigdir}/macros.d/macros.python3
%endif
%{_rpmconfigdir}/macros.d/macros.%{python_pkg_name}
# binary parts
%dir %{sitedir}/lib-dynload
%{dynlib array}