From dc64d7b4365db52364123b89e11e9850b2c563cf Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 28 Jul 2018 14:19:20 +0200 Subject: [PATCH] Split python to pythondist generator Running this python script on all possible files is way too expensive. Some of the packages timeout due to that. Signed-off-by: Igor Gnatenko --- python-rpm-generators.spec | 14 ++++++++++---- python.attr | 4 ++-- pythondist.attr | 3 +++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 pythondist.attr diff --git a/python-rpm-generators.spec b/python-rpm-generators.spec index 2ecf76c..dc544a6 100644 --- a/python-rpm-generators.spec +++ b/python-rpm-generators.spec @@ -5,7 +5,7 @@ Name: python-rpm-generators Summary: Dependency generators for Python RPMs Version: 5 -Release: 2%{?dist} +Release: 3%{?dist} # Originally all those files were part of RPM, so license is kept here License: GPLv2+ @@ -13,8 +13,9 @@ Url: https://src.fedoraproject.org/python-rpm-generators # Commit is the last change in following files Source0: https://raw.githubusercontent.com/rpm-software-management/rpm/102eab50b3d0d6546dfe082eac0ade21e6b3dbf1/COPYING Source1: python.attr -Source2: pythondeps.sh -Source3: pythondistdeps.py +Source2: pythondist.attr +Source3: pythondeps.sh +Source4: pythondistdeps.py BuildArch: noarch @@ -26,6 +27,8 @@ Summary: %{summary} Requires: python3-setuptools # The point of split Conflicts: rpm-build < 4.13.0.1-2 +# Breaking change, change a way how depgen is enabled +Conflicts: python-rpm-macros < 3-36 %description -n python3-rpm-generators %{summary}. @@ -35,7 +38,7 @@ Conflicts: rpm-build < 4.13.0.1-2 cp -a %{sources} . %install -install -Dpm0644 -t %{buildroot}%{_fileattrsdir} python.attr +install -Dpm0644 -t %{buildroot}%{_fileattrsdir} python.attr pythondist.attr install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py %files -n python3-rpm-generators @@ -45,6 +48,9 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py %{_rpmconfigdir}/pythondistdeps.py %changelog +* Sat Jul 28 2018 Igor Gnatenko - 5-3 +- Add pythondist generator + * Sat Jul 14 2018 Fedora Release Engineering - 5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/python.attr b/python.attr index a7381d6..0f3c2cc 100644 --- a/python.attr +++ b/python.attr @@ -1,4 +1,4 @@ -%__python_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides +%__python_provides %{_rpmconfigdir}/pythondeps.sh --provides %__python_requires %{_rpmconfigdir}/pythondeps.sh --requires -%__python_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$ +%__python_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$ %__python_magic [Pp]ython.*(executable|byte-compiled) diff --git a/pythondist.attr b/pythondist.attr new file mode 100644 index 0000000..641d701 --- /dev/null +++ b/pythondist.attr @@ -0,0 +1,3 @@ +%__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides +#%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires +%__pythondist_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*\\.(dist.*|egg.*))$