Prevent conflicts due libffi in AlmaLinux 9

Reviewed-on: #36

.gitmodules

@@ -1,540 +1,540 @@
 [submodule "autoconf-archive-sle12"]
 	path = autoconf-archive-sle12
 	url = ../autoconf-archive-sle12
-	branch = bundle
+	branch = bundle_next
 [submodule "pcre2-sle12"]
 	path = pcre2-sle12
 	url = ../pcre2-sle12
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundle-libffi"]
 	path = saltbundle-libffi
 	url = ../saltbundle-libffi
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundle-libsodium"]
 	path = saltbundle-libsodium
 	url = ../saltbundle-libsodium
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundle-libyaml"]
 	path = saltbundle-libyaml
 	url = ../saltbundle-libyaml
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundle-openssl-sle12"]
 	path = saltbundle-openssl-sle12
 	url = ../saltbundle-openssl-sle12
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy"]
 	path = saltbundlepy
 	url = ../saltbundlepy
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-appdirs"]
 	path = saltbundlepy-appdirs
 	url = ../saltbundlepy-appdirs
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-asn1crypto"]
 	path = saltbundlepy-asn1crypto
 	url = ../saltbundlepy-asn1crypto
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-atomicwrites"]
 	path = saltbundlepy-atomicwrites
 	url = ../saltbundlepy-atomicwrites
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-attrs"]
 	path = saltbundlepy-attrs
 	url = ../saltbundlepy-attrs
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-bcrypt"]
 	path = saltbundlepy-bcrypt
 	url = ../saltbundlepy-bcrypt
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-certifi"]
 	path = saltbundlepy-certifi
 	url = ../saltbundlepy-certifi
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-cffi"]
 	path = saltbundlepy-cffi
 	url = ../saltbundlepy-cffi
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-chardet"]
 	path = saltbundlepy-chardet
 	url = ../saltbundlepy-chardet
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-cryptography"]
 	path = saltbundlepy-cryptography
 	url = ../saltbundlepy-cryptography
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-cryptography-vectors"]
 	path = saltbundlepy-cryptography-vectors
 	url = ../saltbundlepy-cryptography-vectors
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-cssselect"]
 	path = saltbundlepy-cssselect
 	url = ../saltbundlepy-cssselect
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-cython"]
 	path = saltbundlepy-cython
 	url = ../saltbundlepy-cython
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-dateutil"]
 	path = saltbundlepy-dateutil
 	url = ../saltbundlepy-dateutil
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-dbus-python"]
 	path = saltbundlepy-dbus-python
 	url = ../saltbundlepy-dbus-python
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-distro"]
 	path = saltbundlepy-distro
 	url = ../saltbundlepy-distro
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-docker"]
 	path = saltbundlepy-docker
 	url = ../saltbundlepy-docker
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-docker-pycreds"]
 	path = saltbundlepy-docker-pycreds
 	url = ../saltbundlepy-docker-pycreds
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-docopt"]
 	path = saltbundlepy-docopt
 	url = ../saltbundlepy-docopt
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-editables"]
 	path = saltbundlepy-editables
 	url = ../saltbundlepy-editables
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-exceptiongroup"]
 	path = saltbundlepy-exceptiongroup
 	url = ../saltbundlepy-exceptiongroup
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-flit-core"]
 	path = saltbundlepy-flit-core
 	url = ../saltbundlepy-flit-core
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-flit-scm"]
 	path = saltbundlepy-flit-scm
 	url = ../saltbundlepy-flit-scm
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-hatch-fancy-pypi-readme"]
 	path = saltbundlepy-hatch-fancy-pypi-readme
 	url = ../saltbundlepy-hatch-fancy-pypi-readme
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-hatchling"]
 	path = saltbundlepy-hatchling
 	url = ../saltbundlepy-hatchling
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-hatch-vcs"]
 	path = saltbundlepy-hatch-vcs
 	url = ../saltbundlepy-hatch-vcs
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-idna"]
 	path = saltbundlepy-idna
 	url = ../saltbundlepy-idna
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-importlib-metadata"]
 	path = saltbundlepy-importlib-metadata
 	url = ../saltbundlepy-importlib-metadata
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-iniconfig"]
 	path = saltbundlepy-iniconfig
 	url = ../saltbundlepy-iniconfig
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-jinja2"]
 	path = saltbundlepy-jinja2
 	url = ../saltbundlepy-jinja2
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-jmespath"]
 	path = saltbundlepy-jmespath
 	url = ../saltbundlepy-jmespath
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-kiwi"]
 	path = saltbundlepy-kiwi
 	url = ../saltbundlepy-kiwi
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-libvirt-sle12"]
 	path = saltbundlepy-libvirt-sle12
 	url = ../saltbundlepy-libvirt-sle12
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-libvirt-sle15"]
 	path = saltbundlepy-libvirt-sle15
 	url = ../saltbundlepy-libvirt-sle15
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-looseversion"]
 	path = saltbundlepy-looseversion
 	url = ../saltbundlepy-looseversion
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-lxml"]
 	path = saltbundlepy-lxml
 	url = ../saltbundlepy-lxml
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-m2crypto"]
 	path = saltbundlepy-m2crypto
 	url = ../saltbundlepy-m2crypto
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-markupsafe"]
 	path = saltbundlepy-markupsafe
 	url = ../saltbundlepy-markupsafe
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-more-itertools"]
 	path = saltbundlepy-more-itertools
 	url = ../saltbundlepy-more-itertools
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-msgpack"]
 	path = saltbundlepy-msgpack
 	url = ../saltbundlepy-msgpack
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-netaddr"]
 	path = saltbundlepy-netaddr
 	url = ../saltbundlepy-netaddr
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-packaging"]
 	path = saltbundlepy-packaging
 	url = ../saltbundlepy-packaging
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-paramiko"]
 	path = saltbundlepy-paramiko
 	url = ../saltbundlepy-paramiko
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-passlib"]
 	path = saltbundlepy-passlib
 	url = ../saltbundlepy-passlib
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pathspec"]
 	path = saltbundlepy-pathspec
 	url = ../saltbundlepy-pathspec
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pip"]
 	path = saltbundlepy-pip
 	url = ../saltbundlepy-pip
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pluggy"]
 	path = saltbundlepy-pluggy
 	url = ../saltbundlepy-pluggy
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-ply"]
 	path = saltbundlepy-ply
 	url = ../saltbundlepy-ply
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-psutil"]
 	path = saltbundlepy-psutil
 	url = ../saltbundlepy-psutil
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-ptyprocess"]
 	path = saltbundlepy-ptyprocess
 	url = ../saltbundlepy-ptyprocess
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-py"]
 	path = saltbundlepy-py
 	url = ../saltbundlepy-py
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pyasn1"]
 	path = saltbundlepy-pyasn1
 	url = ../saltbundlepy-pyasn1
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pyasn1-modules"]
 	path = saltbundlepy-pyasn1-modules
 	url = ../saltbundlepy-pyasn1-modules
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pycparser"]
 	path = saltbundlepy-pycparser
 	url = ../saltbundlepy-pycparser
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pycurl"]
 	path = saltbundlepy-pycurl
 	url = ../saltbundlepy-pycurl
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pyinotify"]
 	path = saltbundlepy-pyinotify
 	url = ../saltbundlepy-pyinotify
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pynacl"]
 	path = saltbundlepy-pynacl
 	url = ../saltbundlepy-pynacl
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pyopenssl"]
 	path = saltbundlepy-pyopenssl
 	url = ../saltbundlepy-pyopenssl
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pyparsing"]
 	path = saltbundlepy-pyparsing
 	url = ../saltbundlepy-pyparsing
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pysocks"]
 	path = saltbundlepy-pysocks
 	url = ../saltbundlepy-pysocks
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pytest"]
 	path = saltbundlepy-pytest
 	url = ../saltbundlepy-pytest
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pytz"]
 	path = saltbundlepy-pytz
 	url = ../saltbundlepy-pytz
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pyxattr"]
 	path = saltbundlepy-pyxattr
 	url = ../saltbundlepy-pyxattr
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pyyaml"]
 	path = saltbundlepy-pyyaml
 	url = ../saltbundlepy-pyyaml
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-pyzmq"]
 	path = saltbundlepy-pyzmq
 	url = ../saltbundlepy-pyzmq
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-requests"]
 	path = saltbundlepy-requests
 	url = ../saltbundlepy-requests
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-rpm-macros"]
 	path = saltbundlepy-rpm-macros
 	url = ../saltbundlepy-rpm-macros
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-rpm-vercmp"]
 	path = saltbundlepy-rpm-vercmp
 	url = ../saltbundlepy-rpm-vercmp
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-setuptools"]
 	path = saltbundlepy-setuptools
 	url = ../saltbundlepy-setuptools
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-setuptools-scm"]
 	path = saltbundlepy-setuptools-scm
 	url = ../saltbundlepy-setuptools-scm
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-simplejson"]
 	path = saltbundlepy-simplejson
 	url = ../saltbundlepy-simplejson
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-six"]
 	path = saltbundlepy-six
 	url = ../saltbundlepy-six
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-tomli"]
 	path = saltbundlepy-tomli
 	url = ../saltbundlepy-tomli
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-tornado"]
 	path = saltbundlepy-tornado
 	url = ../saltbundlepy-tornado
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-typing-extensions"]
 	path = saltbundlepy-typing-extensions
 	url = ../saltbundlepy-typing-extensions
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-urllib3"]
 	path = saltbundlepy-urllib3
 	url = ../saltbundlepy-urllib3
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-venvjail"]
 	path = saltbundlepy-venvjail
 	url = ../saltbundlepy-venvjail
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-wcwidth"]
 	path = saltbundlepy-wcwidth
 	url = ../saltbundlepy-wcwidth
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-websocket-client"]
 	path = saltbundlepy-websocket-client
 	url = ../saltbundlepy-websocket-client
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-wheel"]
 	path = saltbundlepy-wheel
 	url = ../saltbundlepy-wheel
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-zipp"]
 	path = saltbundlepy-zipp
 	url = ../saltbundlepy-zipp
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-zypp-plugin"]
 	path = saltbundlepy-zypp-plugin
 	url = ../saltbundlepy-zypp-plugin
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundle-swig"]
 	path = saltbundle-swig
 	url = ../saltbundle-swig
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundle-zeromq"]
 	path = saltbundle-zeromq
 	url = ../saltbundle-zeromq
-	branch = bundle
+	branch = bundle_next
 [submodule "venv-salt-minion"]
 	path = venv-salt-minion
 	url = ../venv-salt-minion
-	branch = bundle
+	branch = bundle_next
 [submodule "deb-perl-macros"]
 	path = deb-perl-macros
 	url = ../deb-perl-macros
-	branch = bundle
+	branch = bundle_next
 [submodule "debbuild"]
 	path = debbuild
 	url = ../debbuild
-	branch = bundle
+	branch = bundle_next
 [submodule "debbuild-macros"]
 	path = debbuild-macros
 	url = ../debbuild-macros
-	branch = bundle
+	branch = bundle_next
 [submodule "lua-macros"]
 	path = lua-macros
 	url = ../lua-macros
-	branch = bundle
+	branch = bundle_next
 [submodule "lua51"]
 	path = lua51
 	url = ../lua51
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Capture-Tiny"]
 	path = perl-Capture-Tiny
 	url = ../perl-Capture-Tiny
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Carp"]
 	path = perl-Carp
 	url = ../perl-Carp
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Class-Data-Inheritable"]
 	path = perl-Class-Data-Inheritable
 	url = ../perl-Class-Data-Inheritable
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Devel-StackTrace"]
 	path = perl-Devel-StackTrace
 	url = ../perl-Devel-StackTrace
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Devel-Symdump"]
 	path = perl-Devel-Symdump
 	url = ../perl-Devel-Symdump
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Exception-Class"]
 	path = perl-Exception-Class
 	url = ../perl-Exception-Class
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-ExtUtils-CBuilder"]
 	path = perl-ExtUtils-CBuilder
 	url = ../perl-ExtUtils-CBuilder
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-ExtUtils-MakeMaker"]
 	path = perl-ExtUtils-MakeMaker
 	url = ../perl-ExtUtils-MakeMaker
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-ExtUtils-PkgConfig"]
 	path = perl-ExtUtils-PkgConfig
 	url = ../perl-ExtUtils-PkgConfig
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-File-Path"]
 	path = perl-File-Path
 	url = ../perl-File-Path
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-File-Temp"]
 	path = perl-File-Temp
 	url = ../perl-File-Temp
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-IPC-Cmd"]
 	path = perl-IPC-Cmd
 	url = ../perl-IPC-Cmd
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Lua-API"]
 	path = perl-Lua-API
 	url = ../perl-Lua-API
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-MRO-Compat"]
 	path = perl-MRO-Compat
 	url = ../perl-MRO-Compat
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Module-Build"]
 	path = perl-Module-Build
 	url = ../perl-Module-Build
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Module-Metadata"]
 	path = perl-Module-Metadata
 	url = ../perl-Module-Metadata
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Module-Runtime"]
 	path = perl-Module-Runtime
 	url = ../perl-Module-Runtime
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Perl-OSType"]
 	path = perl-Perl-OSType
 	url = ../perl-Perl-OSType
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Pod-Coverage"]
 	path = perl-Pod-Coverage
 	url = ../perl-Pod-Coverage
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Sub-Uplevel"]
 	path = perl-Sub-Uplevel
 	url = ../perl-Sub-Uplevel
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Test-Class"]
 	path = perl-Test-Class
 	url = ../perl-Test-Class
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Test-Compile"]
 	path = perl-Test-Compile
 	url = ../perl-Test-Compile
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Test-Deep"]
 	path = perl-Test-Deep
 	url = ../perl-Test-Deep
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Test-Differences"]
 	path = perl-Test-Differences
 	url = ../perl-Test-Differences
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Test-Exception"]
 	path = perl-Test-Exception
 	url = ../perl-Test-Exception
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Test-Most"]
 	path = perl-Test-Most
 	url = ../perl-Test-Most
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Test-Pod"]
 	path = perl-Test-Pod
 	url = ../perl-Test-Pod
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Test-Pod-Coverage"]
 	path = perl-Test-Pod-Coverage
 	url = ../perl-Test-Pod-Coverage
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Test-Warn"]
 	path = perl-Test-Warn
 	url = ../perl-Test-Warn
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Text-Diff"]
 	path = perl-Text-Diff
 	url = ../perl-Text-Diff
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-Try-Tiny"]
 	path = perl-Try-Tiny
 	url = ../perl-Try-Tiny
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-UNIVERSAL-require"]
 	path = perl-UNIVERSAL-require
 	url = ../perl-UNIVERSAL-require
-	branch = bundle
+	branch = bundle_next
 [submodule "perl-parent"]
 	path = perl-parent
 	url = ../perl-parent
-	branch = bundle
+	branch = bundle_next
 [submodule "fdupes"]
 	path = fdupes
 	url = ../fdupes
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-apt-debian11-12"]
 	path = saltbundlepy-apt-debian11-12
 	url = ../saltbundlepy-apt-debian11-12
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-apt-ubuntu2004"]
 	path = saltbundlepy-apt-ubuntu2004
 	url = ../saltbundlepy-apt-ubuntu2004
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-apt-ubuntu2204"]
 	path = saltbundlepy-apt-ubuntu2204
 	url = ../saltbundlepy-apt-ubuntu2204
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-apt-ubuntu2404"]
 	path = saltbundlepy-apt-ubuntu2404
 	url = ../saltbundlepy-apt-ubuntu2404
-	branch = bundle
+	branch = bundle_next
 [submodule "saltbundlepy-libvirt-sle16"]
 	path = saltbundlepy-libvirt-sle16
 	url = ../saltbundlepy-libvirt-sle16
-	branch = bundle
+	branch = bundle_next

_config

@@ -2,7 +2,7 @@
 ##################### SLE_12 ###############################
 ############################################################
 %if 0%{?suse_version} == 1315
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$
 
 Prefer: saltbundle-libopenssl1_0_0
 Prefer: saltbundle-libyaml
@@ -21,7 +21,7 @@ Macros:
 ##################### SLE_15 ###############################
 ############################################################
 %if 0%{?suse_version} == 1500
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$
 
 Prefer: saltbundle-libyaml
 
@@ -31,7 +31,7 @@ Prefer: saltbundle-libyaml
 ##################### SLE_16 ###############################
 ############################################################
 %if 0%{?suse_version} == 1600
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$
 
 FileProvides: /usr/bin/python3.11 saltbundlepy-base
 FileProvides: /usr/bin/python3 saltbundlepy-base
@@ -63,8 +63,11 @@ Substitute: netcfg setup
 Substitute: timezone tzdata
 Substitute: update-alternatives alternatives
 
-Prefer: saltbundle-libffi8
-Prefer: saltbundle-libffi-devel
+Ignore: ca-certificates:libffi
+Ignore: p11-kit:libffi.so.8()(64bit)
+Ignore: p11-kit:libffi.so.8(LIBFFI_BASE_8.0)(64bit)
+Ignore: p11-kit:libffi.so.8(LIBFFI_CLOSURE_8.0)(64bit)
+Prefer: libffi
 
 Prefer: selinux-policy-targeted
 
@@ -72,7 +75,7 @@ Prefer: util-linux-core
 
 FileProvides: /usr/bin/who coreutils
 
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$
 
 Macros:
 %ext_man .gz
@@ -100,13 +103,17 @@ Substitute: netcfg setup
 Substitute: timezone tzdata
 Substitute: update-alternatives alternatives
 
-Prefer: saltbundle-libffi8
+Ignore: ca-certificates:libffi
+Ignore: p11-kit:libffi.so.8()(64bit)
+Ignore: p11-kit:libffi.so.8(LIBFFI_BASE_8.0)(64bit)
+Ignore: p11-kit:libffi.so.8(LIBFFI_CLOSURE_8.0)(64bit)
+Prefer: libffi
 
 Prefer: selinux-policy-targeted
 
 FileProvides: /usr/bin/who coreutils
 
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$
 
 # ignore python3-distro as it causes file conflicts with saltbundlepy-distro
 Ignore: python3-distro
@@ -132,14 +139,14 @@ Prefer: saltbundle-libffi-devel
 
 FileProvides: /usr/bin/who coreutils
 
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$
 %endif
 
 ############################################################
 ##################### EL7 ##################################
 ############################################################
 %if 0%{?rhel} == 7 || "%_repository" == "EL7" || "%_repository" == "CentOS_7"
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$
 
 Support: !ncurses-devel
 Support: !gdbm-devel
@@ -219,7 +226,7 @@ Substitute: /usr/bin/who coreutils
 
 FileProvides: /usr/bin/who coreutils
 
-PublishFilter: ^(?!venv-salt-minion).*\.deb$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.deb$
 
 Macros:
 %_vendor debbuild
@@ -282,7 +289,7 @@ Substitute: pkgconfig(uuid) uuid-dev
 Substitute: pkgconfig(x11) libx11-dev
 Substitute: pkgconfig(zlib) zlib1g-dev
 
-PublishFilter: ^saltbundle.*\.deb$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.deb$
 ######## End salt bundle
 
 ######## Start Lua substitutes
@@ -374,7 +381,7 @@ Substitute: pkgconfig(zlib) zlib1g-dev
 
 FileProvides: /usr/bin/who coreutils
 
-PublishFilter: ^(?!venv-salt-minion).*\.deb$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.deb$
 
 Release: <CI_CNT>.<B_CNT> spec:150750.<CI_CNT>.<B_CNT>.develHead
 
@@ -451,7 +458,7 @@ Substitute: pkgconfig(zlib) zlib1g-dev
 
 FileProvides: /usr/bin/who coreutils
 
-PublishFilter: ^(?!venv-salt-minion).*\.deb$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.deb$
 
 Macros:
 %_vendor debbuild
@@ -470,18 +477,12 @@ Macros:
 ############################################################
 #FIXME: we need to properly detect SL Micro 6.0
 %if "%_repository" == "Micro_60"
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
-
-FileProvides: /usr/bin/python3.11 saltbundlepy-base
-
-Prefer: saltbundle-libffi8
-Prefer: saltbundle-libyaml
-
-FileProvides: /usr/bin/python3 saltbundlepy-base
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$
 
 BuildFlags: excludebuild:spacecmd
 
 Ignore: cmake-mini:python3-base
+Ignore: gdb:python3-base
 %endif
 
 ############################################################

_maintainership.json

@@ -0,0 +1,3 @@
+{
+  "": ["PSuarezHernandez","agraul","vizhestkov","ygutierrez","mczernek"]
+}

staging.config

@@ -0,0 +1,4 @@
+{
+  "ObsProject": "systemsmanagement:saltstack:bundle:scm:next",
+  "StagingProject": "systemsmanagement:saltstack:bundle:scm:next:PullRequest"
+}

workflow.config

@@ -0,0 +1,7 @@
+{
+    "Workflows": ["direct", "pr"],
+    "Organization": "saltbundle",
+    "Branch": "bundle_next",
+    "GitProjectName": "saltbundle/_ObsPrj#bundle_next",
+    "ManualMergeProject": true
+}