From 3ba26fd9e0c2aa7c64387823dd9af12ac1784c81 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 7 Dec 2020 10:54:00 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/redhat-rpm-config.git#c0fba28f761b7a281fd8513c27a615fce8f96971 --- brp-python-bytecompile | 2 +- redhat-rpm-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/brp-python-bytecompile b/brp-python-bytecompile index fbbd02b..012e8b5 100755 --- a/brp-python-bytecompile +++ b/brp-python-bytecompile @@ -119,7 +119,7 @@ fi export PYTHONHASHSEED=0 shopt -s nullglob -for python_libdir in `find "$RPM_BUILD_ROOT" -type d|grep -E "/usr/lib(64)?/python[0-9]\.[0-9]+$"`; +for python_libdir in `find "$RPM_BUILD_ROOT" -type d|grep -E "/(usr|app)/lib(64)?/python[0-9]\.[0-9]+$"`; do python_binary=/usr/bin/$(basename $python_libdir) real_libdir=${python_libdir/$RPM_BUILD_ROOT/} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index baac178..21813b4 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 177 +Version: 178 Release: 1%{?dist} # No version specified. License: GPL+ @@ -213,6 +213,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Sun Nov 29 2020 Miro Hrončok - 178-1 +- BRP Python Bytecompile: Also detect Python files in /app/lib/pythonX.Y + * Tue Oct 27 2020 Tom Stellard - 177-1 - Add back -fcf-protection flag for x86_64