diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-09-24 10:00:54 +0200 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-09-24 10:20:57 +0200 |
commit | 2384e85968fad813eb555807055b7ca18ed92ecf (patch) | |
tree | 2d2437fcd6aea4a8abc31c289568cda2c6e7ecdf | |
parent | a7b1b5b2061171bac56fb0f5ed29314a0c37e9b0 (diff) | |
download | rpm-setup-2384e85968fad813eb555807055b7ca18ed92ecf.tar rpm-setup-2384e85968fad813eb555807055b7ca18ed92ecf.tar.gz rpm-setup-2384e85968fad813eb555807055b7ca18ed92ecf.tar.bz2 rpm-setup-2384e85968fad813eb555807055b7ca18ed92ecf.tar.xz rpm-setup-2384e85968fad813eb555807055b7ca18ed92ecf.zip |
split&sync %__brp_python_bytecompile with upstream
Thus using "%global __python %{__python3}" enables to properly fix python3
bytecompiling
Also recognize %_python_bytecompile_extra for compiling outisde python
specific directories
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | build.macros.in | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -1,5 +1,9 @@ - reduce triming changelog from 3 to 2 years - remove duplicated systemd macros +- sync %__brp_python_bytecompile with upstream : + o "%global __python %{__python3}" enables to properly fix py3 bytecompiling + o also recognize %_python_bytecompile_extra for compiling outisde python + specific directories - terminate build when missing buildids by default Version 2.34 - 8 September 2018, by Thierry Vignaud diff --git a/build.macros.in b/build.macros.in index 286ccdb..09c96d5 100644 --- a/build.macros.in +++ b/build.macros.in @@ -445,9 +445,11 @@ fi #--------------------------------------------------------------------- # Expanded at end of %install scriptlet. +%__brp_python_bytecompile /usr/lib/rpm/brp-python-bytecompile "%{__python}" "%{?_python_bytecompile_errors_terminate_build}" "%{?_python_bytecompile_extra}" + %__os_install_post \ %{?__spec_helper_post}%{?!__spec_helper_post:/usr/share/spec-helper/spec-helper} \ - %{?__brp_python_bytecompile} \ + %{?py_auto_byte_compile:%{?__brp_python_bytecompile}} \ %{?__brp_python_hardlink}%{!?__brp_python_hardlink:/usr/lib/rpm/brp-python-hardlink} \ %{nil} @@ -467,6 +469,8 @@ fi # ## Should python bytecompilation errors terminate a build? %_python_bytecompile_errors_terminate_build 1 +## Should python bytecompilation compile outisde python specific directories? +%_python_bytecompile_extra 1 # Use SHA-256 for FILEDIGESTS instead of default MD5 %_source_filedigest_algorithm 8 |