File set-pythons-macro.patch of Package saltbundlepy-rpm-macros

Overview Repositories Revisions Requests Users Attributes Meta

File set-pythons-macro.patch of Package saltbundlepy-rpm-macros (Revision 4562646745f09f19dac596ecbff40975)

Currently displaying revision 4562646745f09f19dac596ecbff40975 , Show latest

--- a/compile-macros.sh
+++ b/compile-macros.sh
@@ -18,14 +18,6 @@
 # the current build target's prjconf
 echo "Setting buildset:"
 echo "## Python Buildset Begin" | tee macros/040-builset-start
-# First try to find the block from Factory
-sed -n '/## PYTHON MACROS BEGIN/,/## PYTHON MACROS END/ p' ~/.rpmmacros | tee macros/041-buildset
-# If that fails, find the old definitions (SUSE:SLE-15-SP?:GA, openSUSE:Leap:15.?)
-if [ ! -s macros/041-buildset ]; then
-    sed -n '/%pythons/,/%add_python/ p' ~/.rpmmacros | tee macros/041-buildset
-fi
-# If we still have nothing (different distro, custom prjconf, building
-# python-rpm-macros outside of obs), use the default file
 if [ ! -s macros/041-buildset ]; then
     tee macros/041-buildset < default-prjconf
 fi
--- a/default-prjconf
+++ b/default-prjconf
@@ -7,7 +7,7 @@
 ## PYTHON MACROS BEGIN
 # order of %pythons is important: The last flavor overrides any operation on conflicting files and definitions during expansions,
 # making it the "default" in many cases --> keep the primary python3 provider at the end.
-%pythons %{?!skip_python3:%{?!skip_python39:python39} %{?!skip_python311:python311} %{?!skip_python310:python310}}
+%pythons saltbundlepy
 %add_python() %{expand:%%define pythons %1 %pythons}
 
 %_without_python2 1

Places

File set-pythons-macro.patch of Package saltbundlepy-rpm-macros (Revision 4562646745f09f19dac596ecbff40975)

Places