Remove macros.pybytecompile3.7
It will live in python-rpm-macros, see: https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/4
This commit is contained in:
parent
a50d5ce864
commit
3422f8b4a4
@ -1,25 +0,0 @@
|
|||||||
# Note that the path could itself be a python file, or a directory
|
|
||||||
|
|
||||||
# Python's compile_all module only works on directories, and requires a max
|
|
||||||
# recursion depth
|
|
||||||
|
|
||||||
# Note that the py_byte_compile macro should work for python2 as well
|
|
||||||
# Which unfortunately makes the definition more complicated than it should be
|
|
||||||
# The condition should be reversed once /usr/bin/python is python3!
|
|
||||||
|
|
||||||
%py_byte_compile()\
|
|
||||||
py2_byte_compile () {\
|
|
||||||
python_binary="%1"\
|
|
||||||
bytecode_compilation_path="%2"\
|
|
||||||
find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\
|
|
||||||
find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\
|
|
||||||
}\
|
|
||||||
\
|
|
||||||
py3_byte_compile () {\
|
|
||||||
python_binary="%1"\
|
|
||||||
bytecode_compilation_path="%2"\
|
|
||||||
find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2], optimize=opt) for opt in range(2) for f in sys.argv[1:]]' || :\
|
|
||||||
}\
|
|
||||||
\
|
|
||||||
[[ "%1" == *python3* ]] || py2_byte_compile "%1" "%2" && py3_byte_compile "%1" "%2" \
|
|
||||||
%{nil}
|
|
@ -242,11 +242,6 @@ BuildRequires: python3-pip
|
|||||||
|
|
||||||
Source: https://www.python.org/ftp/python/%{version}/Python-%{version}%{prerel}.tar.xz
|
Source: https://www.python.org/ftp/python/%{version}/Python-%{version}%{prerel}.tar.xz
|
||||||
|
|
||||||
# Supply an RPM macro "py_byte_compile" for the python3-devel subpackage
|
|
||||||
# to enable specfiles to selectively byte-compile individual files and paths
|
|
||||||
# with different Python runtimes as necessary:
|
|
||||||
Source3: macros.pybytecompile%{pybasever}
|
|
||||||
|
|
||||||
# A simple script to check timestamps of bytecode files
|
# A simple script to check timestamps of bytecode files
|
||||||
# Run in check section with Python that is currently being built
|
# Run in check section with Python that is currently being built
|
||||||
# Written by bkabrda
|
# Written by bkabrda
|
||||||
@ -967,7 +962,6 @@ find %{buildroot} -perm 555 -exec chmod 755 {} \;
|
|||||||
# Install macros for rpm:
|
# Install macros for rpm:
|
||||||
%if %{without flatpackage}
|
%if %{without flatpackage}
|
||||||
mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/
|
mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/
|
||||||
install -m 644 %{SOURCE3} %{buildroot}/%{_rpmconfigdir}/macros.d/
|
|
||||||
install -m 644 %{SOURCE9} %{buildroot}/%{_rpmconfigdir}/macros.d/
|
install -m 644 %{SOURCE9} %{buildroot}/%{_rpmconfigdir}/macros.d/
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -1366,7 +1360,6 @@ CheckPython optimized
|
|||||||
%{_bindir}/python3-config
|
%{_bindir}/python3-config
|
||||||
%{_libdir}/pkgconfig/python3.pc
|
%{_libdir}/pkgconfig/python3.pc
|
||||||
%{_rpmconfigdir}/macros.d/macros.systempython
|
%{_rpmconfigdir}/macros.d/macros.systempython
|
||||||
%{_rpmconfigdir}/macros.d/macros.pybytecompile%{pybasever}
|
|
||||||
%{_bindir}/pathfix.py
|
%{_bindir}/pathfix.py
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user