diff --git a/.gitmodules b/.gitmodules index 94621ef..f784787 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,540 +1,540 @@ [submodule "autoconf-archive-sle12"] path = autoconf-archive-sle12 url = ../autoconf-archive-sle12 - branch = bundle + branch = bundle_testing [submodule "pcre2-sle12"] path = pcre2-sle12 url = ../pcre2-sle12 - branch = bundle + branch = bundle_testing [submodule "saltbundle-libffi"] path = saltbundle-libffi url = ../saltbundle-libffi - branch = bundle + branch = bundle_testing [submodule "saltbundle-libsodium"] path = saltbundle-libsodium url = ../saltbundle-libsodium - branch = bundle + branch = bundle_testing [submodule "saltbundle-libyaml"] path = saltbundle-libyaml url = ../saltbundle-libyaml - branch = bundle + branch = bundle_testing [submodule "saltbundle-openssl-sle12"] path = saltbundle-openssl-sle12 url = ../saltbundle-openssl-sle12 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy"] path = saltbundlepy url = ../saltbundlepy - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-appdirs"] path = saltbundlepy-appdirs url = ../saltbundlepy-appdirs - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-asn1crypto"] path = saltbundlepy-asn1crypto url = ../saltbundlepy-asn1crypto - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-atomicwrites"] path = saltbundlepy-atomicwrites url = ../saltbundlepy-atomicwrites - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-attrs"] path = saltbundlepy-attrs url = ../saltbundlepy-attrs - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-bcrypt"] path = saltbundlepy-bcrypt url = ../saltbundlepy-bcrypt - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-certifi"] path = saltbundlepy-certifi url = ../saltbundlepy-certifi - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-cffi"] path = saltbundlepy-cffi url = ../saltbundlepy-cffi - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-chardet"] path = saltbundlepy-chardet url = ../saltbundlepy-chardet - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-cryptography"] path = saltbundlepy-cryptography url = ../saltbundlepy-cryptography - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-cryptography-vectors"] path = saltbundlepy-cryptography-vectors url = ../saltbundlepy-cryptography-vectors - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-cssselect"] path = saltbundlepy-cssselect url = ../saltbundlepy-cssselect - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-cython"] path = saltbundlepy-cython url = ../saltbundlepy-cython - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-dateutil"] path = saltbundlepy-dateutil url = ../saltbundlepy-dateutil - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-dbus-python"] path = saltbundlepy-dbus-python url = ../saltbundlepy-dbus-python - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-distro"] path = saltbundlepy-distro url = ../saltbundlepy-distro - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-docker"] path = saltbundlepy-docker url = ../saltbundlepy-docker - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-docker-pycreds"] path = saltbundlepy-docker-pycreds url = ../saltbundlepy-docker-pycreds - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-docopt"] path = saltbundlepy-docopt url = ../saltbundlepy-docopt - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-editables"] path = saltbundlepy-editables url = ../saltbundlepy-editables - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-exceptiongroup"] path = saltbundlepy-exceptiongroup url = ../saltbundlepy-exceptiongroup - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-flit-core"] path = saltbundlepy-flit-core url = ../saltbundlepy-flit-core - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-flit-scm"] path = saltbundlepy-flit-scm url = ../saltbundlepy-flit-scm - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-hatch-fancy-pypi-readme"] path = saltbundlepy-hatch-fancy-pypi-readme url = ../saltbundlepy-hatch-fancy-pypi-readme - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-hatchling"] path = saltbundlepy-hatchling url = ../saltbundlepy-hatchling - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-hatch-vcs"] path = saltbundlepy-hatch-vcs url = ../saltbundlepy-hatch-vcs - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-idna"] path = saltbundlepy-idna url = ../saltbundlepy-idna - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-importlib-metadata"] path = saltbundlepy-importlib-metadata url = ../saltbundlepy-importlib-metadata - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-iniconfig"] path = saltbundlepy-iniconfig url = ../saltbundlepy-iniconfig - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-jinja2"] path = saltbundlepy-jinja2 url = ../saltbundlepy-jinja2 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-jmespath"] path = saltbundlepy-jmespath url = ../saltbundlepy-jmespath - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-kiwi"] path = saltbundlepy-kiwi url = ../saltbundlepy-kiwi - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-libvirt-sle12"] path = saltbundlepy-libvirt-sle12 url = ../saltbundlepy-libvirt-sle12 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-libvirt-sle15"] path = saltbundlepy-libvirt-sle15 url = ../saltbundlepy-libvirt-sle15 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-looseversion"] path = saltbundlepy-looseversion url = ../saltbundlepy-looseversion - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-lxml"] path = saltbundlepy-lxml url = ../saltbundlepy-lxml - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-m2crypto"] path = saltbundlepy-m2crypto url = ../saltbundlepy-m2crypto - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-markupsafe"] path = saltbundlepy-markupsafe url = ../saltbundlepy-markupsafe - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-more-itertools"] path = saltbundlepy-more-itertools url = ../saltbundlepy-more-itertools - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-msgpack"] path = saltbundlepy-msgpack url = ../saltbundlepy-msgpack - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-netaddr"] path = saltbundlepy-netaddr url = ../saltbundlepy-netaddr - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-packaging"] path = saltbundlepy-packaging url = ../saltbundlepy-packaging - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-paramiko"] path = saltbundlepy-paramiko url = ../saltbundlepy-paramiko - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-passlib"] path = saltbundlepy-passlib url = ../saltbundlepy-passlib - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pathspec"] path = saltbundlepy-pathspec url = ../saltbundlepy-pathspec - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pip"] path = saltbundlepy-pip url = ../saltbundlepy-pip - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pluggy"] path = saltbundlepy-pluggy url = ../saltbundlepy-pluggy - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-ply"] path = saltbundlepy-ply url = ../saltbundlepy-ply - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-psutil"] path = saltbundlepy-psutil url = ../saltbundlepy-psutil - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-ptyprocess"] path = saltbundlepy-ptyprocess url = ../saltbundlepy-ptyprocess - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-py"] path = saltbundlepy-py url = ../saltbundlepy-py - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pyasn1"] path = saltbundlepy-pyasn1 url = ../saltbundlepy-pyasn1 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pyasn1-modules"] path = saltbundlepy-pyasn1-modules url = ../saltbundlepy-pyasn1-modules - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pycparser"] path = saltbundlepy-pycparser url = ../saltbundlepy-pycparser - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pycurl"] path = saltbundlepy-pycurl url = ../saltbundlepy-pycurl - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pyinotify"] path = saltbundlepy-pyinotify url = ../saltbundlepy-pyinotify - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pynacl"] path = saltbundlepy-pynacl url = ../saltbundlepy-pynacl - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pyopenssl"] path = saltbundlepy-pyopenssl url = ../saltbundlepy-pyopenssl - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pyparsing"] path = saltbundlepy-pyparsing url = ../saltbundlepy-pyparsing - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pysocks"] path = saltbundlepy-pysocks url = ../saltbundlepy-pysocks - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pytest"] path = saltbundlepy-pytest url = ../saltbundlepy-pytest - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pytz"] path = saltbundlepy-pytz url = ../saltbundlepy-pytz - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pyxattr"] path = saltbundlepy-pyxattr url = ../saltbundlepy-pyxattr - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pyyaml"] path = saltbundlepy-pyyaml url = ../saltbundlepy-pyyaml - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-pyzmq"] path = saltbundlepy-pyzmq url = ../saltbundlepy-pyzmq - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-requests"] path = saltbundlepy-requests url = ../saltbundlepy-requests - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-rpm-macros"] path = saltbundlepy-rpm-macros url = ../saltbundlepy-rpm-macros - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-rpm-vercmp"] path = saltbundlepy-rpm-vercmp url = ../saltbundlepy-rpm-vercmp - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-setuptools"] path = saltbundlepy-setuptools url = ../saltbundlepy-setuptools - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-setuptools-scm"] path = saltbundlepy-setuptools-scm url = ../saltbundlepy-setuptools-scm - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-simplejson"] path = saltbundlepy-simplejson url = ../saltbundlepy-simplejson - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-six"] path = saltbundlepy-six url = ../saltbundlepy-six - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-tomli"] path = saltbundlepy-tomli url = ../saltbundlepy-tomli - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-tornado"] path = saltbundlepy-tornado url = ../saltbundlepy-tornado - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-typing-extensions"] path = saltbundlepy-typing-extensions url = ../saltbundlepy-typing-extensions - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-urllib3"] path = saltbundlepy-urllib3 url = ../saltbundlepy-urllib3 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-venvjail"] path = saltbundlepy-venvjail url = ../saltbundlepy-venvjail - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-wcwidth"] path = saltbundlepy-wcwidth url = ../saltbundlepy-wcwidth - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-websocket-client"] path = saltbundlepy-websocket-client url = ../saltbundlepy-websocket-client - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-wheel"] path = saltbundlepy-wheel url = ../saltbundlepy-wheel - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-zipp"] path = saltbundlepy-zipp url = ../saltbundlepy-zipp - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-zypp-plugin"] path = saltbundlepy-zypp-plugin url = ../saltbundlepy-zypp-plugin - branch = bundle + branch = bundle_testing [submodule "saltbundle-swig"] path = saltbundle-swig url = ../saltbundle-swig - branch = bundle + branch = bundle_testing [submodule "saltbundle-zeromq"] path = saltbundle-zeromq url = ../saltbundle-zeromq - branch = bundle + branch = bundle_testing [submodule "venv-salt-minion"] path = venv-salt-minion url = ../venv-salt-minion - branch = bundle + branch = bundle_testing [submodule "deb-perl-macros"] path = deb-perl-macros url = ../deb-perl-macros - branch = bundle + branch = bundle_testing [submodule "debbuild"] path = debbuild url = ../debbuild - branch = bundle + branch = bundle_testing [submodule "debbuild-macros"] path = debbuild-macros url = ../debbuild-macros - branch = bundle + branch = bundle_testing [submodule "lua-macros"] path = lua-macros url = ../lua-macros - branch = bundle + branch = bundle_testing [submodule "lua51"] path = lua51 url = ../lua51 - branch = bundle + branch = bundle_testing [submodule "perl-Capture-Tiny"] path = perl-Capture-Tiny url = ../perl-Capture-Tiny - branch = bundle + branch = bundle_testing [submodule "perl-Carp"] path = perl-Carp url = ../perl-Carp - branch = bundle + branch = bundle_testing [submodule "perl-Class-Data-Inheritable"] path = perl-Class-Data-Inheritable url = ../perl-Class-Data-Inheritable - branch = bundle + branch = bundle_testing [submodule "perl-Devel-StackTrace"] path = perl-Devel-StackTrace url = ../perl-Devel-StackTrace - branch = bundle + branch = bundle_testing [submodule "perl-Devel-Symdump"] path = perl-Devel-Symdump url = ../perl-Devel-Symdump - branch = bundle + branch = bundle_testing [submodule "perl-Exception-Class"] path = perl-Exception-Class url = ../perl-Exception-Class - branch = bundle + branch = bundle_testing [submodule "perl-ExtUtils-CBuilder"] path = perl-ExtUtils-CBuilder url = ../perl-ExtUtils-CBuilder - branch = bundle + branch = bundle_testing [submodule "perl-ExtUtils-MakeMaker"] path = perl-ExtUtils-MakeMaker url = ../perl-ExtUtils-MakeMaker - branch = bundle + branch = bundle_testing [submodule "perl-ExtUtils-PkgConfig"] path = perl-ExtUtils-PkgConfig url = ../perl-ExtUtils-PkgConfig - branch = bundle + branch = bundle_testing [submodule "perl-File-Path"] path = perl-File-Path url = ../perl-File-Path - branch = bundle + branch = bundle_testing [submodule "perl-File-Temp"] path = perl-File-Temp url = ../perl-File-Temp - branch = bundle + branch = bundle_testing [submodule "perl-IPC-Cmd"] path = perl-IPC-Cmd url = ../perl-IPC-Cmd - branch = bundle + branch = bundle_testing [submodule "perl-Lua-API"] path = perl-Lua-API url = ../perl-Lua-API - branch = bundle + branch = bundle_testing [submodule "perl-MRO-Compat"] path = perl-MRO-Compat url = ../perl-MRO-Compat - branch = bundle + branch = bundle_testing [submodule "perl-Module-Build"] path = perl-Module-Build url = ../perl-Module-Build - branch = bundle + branch = bundle_testing [submodule "perl-Module-Metadata"] path = perl-Module-Metadata url = ../perl-Module-Metadata - branch = bundle + branch = bundle_testing [submodule "perl-Module-Runtime"] path = perl-Module-Runtime url = ../perl-Module-Runtime - branch = bundle + branch = bundle_testing [submodule "perl-Perl-OSType"] path = perl-Perl-OSType url = ../perl-Perl-OSType - branch = bundle + branch = bundle_testing [submodule "perl-Pod-Coverage"] path = perl-Pod-Coverage url = ../perl-Pod-Coverage - branch = bundle + branch = bundle_testing [submodule "perl-Sub-Uplevel"] path = perl-Sub-Uplevel url = ../perl-Sub-Uplevel - branch = bundle + branch = bundle_testing [submodule "perl-Test-Class"] path = perl-Test-Class url = ../perl-Test-Class - branch = bundle + branch = bundle_testing [submodule "perl-Test-Compile"] path = perl-Test-Compile url = ../perl-Test-Compile - branch = bundle + branch = bundle_testing [submodule "perl-Test-Deep"] path = perl-Test-Deep url = ../perl-Test-Deep - branch = bundle + branch = bundle_testing [submodule "perl-Test-Differences"] path = perl-Test-Differences url = ../perl-Test-Differences - branch = bundle + branch = bundle_testing [submodule "perl-Test-Exception"] path = perl-Test-Exception url = ../perl-Test-Exception - branch = bundle + branch = bundle_testing [submodule "perl-Test-Most"] path = perl-Test-Most url = ../perl-Test-Most - branch = bundle + branch = bundle_testing [submodule "perl-Test-Pod"] path = perl-Test-Pod url = ../perl-Test-Pod - branch = bundle + branch = bundle_testing [submodule "perl-Test-Pod-Coverage"] path = perl-Test-Pod-Coverage url = ../perl-Test-Pod-Coverage - branch = bundle + branch = bundle_testing [submodule "perl-Test-Warn"] path = perl-Test-Warn url = ../perl-Test-Warn - branch = bundle + branch = bundle_testing [submodule "perl-Text-Diff"] path = perl-Text-Diff url = ../perl-Text-Diff - branch = bundle + branch = bundle_testing [submodule "perl-Try-Tiny"] path = perl-Try-Tiny url = ../perl-Try-Tiny - branch = bundle + branch = bundle_testing [submodule "perl-UNIVERSAL-require"] path = perl-UNIVERSAL-require url = ../perl-UNIVERSAL-require - branch = bundle + branch = bundle_testing [submodule "perl-parent"] path = perl-parent url = ../perl-parent - branch = bundle + branch = bundle_testing [submodule "fdupes"] path = fdupes url = ../fdupes - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-apt-debian11-12"] path = saltbundlepy-apt-debian11-12 url = ../saltbundlepy-apt-debian11-12 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-apt-ubuntu2004"] path = saltbundlepy-apt-ubuntu2004 url = ../saltbundlepy-apt-ubuntu2004 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-apt-ubuntu2204"] path = saltbundlepy-apt-ubuntu2204 url = ../saltbundlepy-apt-ubuntu2204 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-apt-ubuntu2404"] path = saltbundlepy-apt-ubuntu2404 url = ../saltbundlepy-apt-ubuntu2404 - branch = bundle + branch = bundle_testing [submodule "saltbundlepy-libvirt-sle16"] path = saltbundlepy-libvirt-sle16 url = ../saltbundlepy-libvirt-sle16 - branch = bundle + branch = bundle_testing diff --git a/_config b/_config index d565980..a55bc30 100644 --- a/_config +++ b/_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: . spec:150750...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 ############################################################ diff --git a/_maintainership.json b/_maintainership.json new file mode 100644 index 0000000..ce80312 --- /dev/null +++ b/_maintainership.json @@ -0,0 +1,3 @@ +{ + "": ["PSuarezHernandez","agraul","vizhestkov","ygutierrez","mczernek"] +} diff --git a/deb-perl-macros b/deb-perl-macros index 0470203..c5ab40d 160000 --- a/deb-perl-macros +++ b/deb-perl-macros @@ -1 +1 @@ -Subproject commit 0470203e0492bc49b2be1fbc0ca97e4854c13f5de7a1b2fe54199b77d4bb1d3c +Subproject commit c5ab40dd27784fade90b835eed45e6ec06c73ad9458baab840ef1ef7d4b04daa diff --git a/debbuild b/debbuild index 0f62415..27c5cd6 160000 --- a/debbuild +++ b/debbuild @@ -1 +1 @@ -Subproject commit 0f6241514464fe7fc9e7b50cbd6544a866631715b3a301ee0e8863163b9c5f8e +Subproject commit 27c5cd6f00e5887648497fa51a1ec54acee5ab8d6184994734d9b37b7bf1ae51 diff --git a/debbuild-macros b/debbuild-macros index 1c2969a..446806b 160000 --- a/debbuild-macros +++ b/debbuild-macros @@ -1 +1 @@ -Subproject commit 1c2969a427f6a296de23e224db00e21d7ef71a716c312c34927c1d42f5b99862 +Subproject commit 446806b100435142893c857242d46327c89fcb68537abdd4c230aa5fbfe20247 diff --git a/fdupes b/fdupes index c7ff5ad..dc6e840 160000 --- a/fdupes +++ b/fdupes @@ -1 +1 @@ -Subproject commit c7ff5ad4b68862c74d21fe0900edb78bcd7d29ba93efcd8807327319e9ce2d37 +Subproject commit dc6e840984dfa00c78ed77c26947bd9a4a38ce850200e02a2ddb2cad60b540f1 diff --git a/lua-macros b/lua-macros index 3515f21..d36769b 160000 --- a/lua-macros +++ b/lua-macros @@ -1 +1 @@ -Subproject commit 3515f214e9437f35b550f7b81da602290798ff416171af6613ff59606d99b006 +Subproject commit d36769bee609f955f95d7ff99a448290f0fa6edff01606379337347ed363f9cb diff --git a/lua51 b/lua51 index cdcf0f0..5d6c715 160000 --- a/lua51 +++ b/lua51 @@ -1 +1 @@ -Subproject commit cdcf0f0c8269491d3e883a223f18b45d6948e9dbe781790df6dd71eb7c9d4067 +Subproject commit 5d6c7154dcd2581353d2419523a9edd6df92cb0cb62e64f12526ca488b826cde diff --git a/perl-Capture-Tiny b/perl-Capture-Tiny index 391ff2f..d8e9e5d 160000 --- a/perl-Capture-Tiny +++ b/perl-Capture-Tiny @@ -1 +1 @@ -Subproject commit 391ff2fd81bfe7af24ca7d4eac1a165940b314c7e876dcb0db2fde9f27d58498 +Subproject commit d8e9e5d49c4fd7d8016c3cbfd6778e46b3bb7c2ad6f78d1661e0e44d081412bd diff --git a/perl-Class-Data-Inheritable b/perl-Class-Data-Inheritable index faee364..dcf1d9e 160000 --- a/perl-Class-Data-Inheritable +++ b/perl-Class-Data-Inheritable @@ -1 +1 @@ -Subproject commit faee36490b067e329018746f3d74d805568bbdeb8f02f9c1ac9698d271f01b72 +Subproject commit dcf1d9e3c3882df301b9b56b278b5939410b8eba14f86ec05c671771d2806103 diff --git a/perl-Devel-StackTrace b/perl-Devel-StackTrace index 29a806d..5ea3459 160000 --- a/perl-Devel-StackTrace +++ b/perl-Devel-StackTrace @@ -1 +1 @@ -Subproject commit 29a806d253113dbef535b44ed847b300ae695c87571218a3290c65075d59dee9 +Subproject commit 5ea34592106e22a884253ff46ba54ff76137b015a584033174f1451e8e835c1a diff --git a/perl-Devel-Symdump b/perl-Devel-Symdump index 9e3412d..24d3901 160000 --- a/perl-Devel-Symdump +++ b/perl-Devel-Symdump @@ -1 +1 @@ -Subproject commit 9e3412dfc8d933c15b23d8c30cdd0132233196dd8486e0c3707a23ecde8dcb3b +Subproject commit 24d3901831ec79bf4781382e77cdcff19029bd249191c3bf9f61e2279276ffc8 diff --git a/perl-Exception-Class b/perl-Exception-Class index 20256e0..920017e 160000 --- a/perl-Exception-Class +++ b/perl-Exception-Class @@ -1 +1 @@ -Subproject commit 20256e0b10072d4a9c42d7225ca2245e4ec91ba95000d0eefdec178b79c77617 +Subproject commit 920017ea8ccc4675dcd44f47efe6f5b585c439dc759bd01cad65976ad02982ca diff --git a/perl-ExtUtils-MakeMaker b/perl-ExtUtils-MakeMaker index cfa9e58..32e530b 160000 --- a/perl-ExtUtils-MakeMaker +++ b/perl-ExtUtils-MakeMaker @@ -1 +1 @@ -Subproject commit cfa9e584c4aabc6ccb5889128f9c71a9d3d1f37a3e28cdf92b74cc6059acdb03 +Subproject commit 32e530b9fcd444bdb766355fde7a9096ee82f9a6d552995d7f277bac61806963 diff --git a/perl-ExtUtils-PkgConfig b/perl-ExtUtils-PkgConfig index edc7f2d..b170e7c 160000 --- a/perl-ExtUtils-PkgConfig +++ b/perl-ExtUtils-PkgConfig @@ -1 +1 @@ -Subproject commit edc7f2dff22e4537178a20a77bf56595f19e710682c4efb219e4c8a8aab69240 +Subproject commit b170e7ca85e0d7907bfa3ed51cee6453f4badbb17bc0903c51aad9f15daedcfe diff --git a/perl-File-Path b/perl-File-Path index 0267ede..25b834c 160000 --- a/perl-File-Path +++ b/perl-File-Path @@ -1 +1 @@ -Subproject commit 0267edea531628230b8c3abbb8a9fff28ff78ea1d9aaad185ddeceb7a8c58137 +Subproject commit 25b834cc05636abbff58aff937107b35e95c7a31262833a7e469274953ff8b49 diff --git a/perl-File-Temp b/perl-File-Temp index 90cc271..b57606c 160000 --- a/perl-File-Temp +++ b/perl-File-Temp @@ -1 +1 @@ -Subproject commit 90cc271b3e9572aca53c0fd534d8aad59989893236a381c624c3e0aab775948a +Subproject commit b57606c3403018bd4e0b5bca52adbe92191e37ee1f3ffcd5e1a880b490582ab9 diff --git a/perl-MRO-Compat b/perl-MRO-Compat index 9c001d8..3e6c9eb 160000 --- a/perl-MRO-Compat +++ b/perl-MRO-Compat @@ -1 +1 @@ -Subproject commit 9c001d8bc0408df27dfde4771c20ebbbbbbae20b65435158f955bb7e3eb06b89 +Subproject commit 3e6c9ebf877e3f29c73857c59f7489e9817e2a4cbdd1eac8a088c0fa6f2df904 diff --git a/perl-Module-Build b/perl-Module-Build index 71ded2f..2208652 160000 --- a/perl-Module-Build +++ b/perl-Module-Build @@ -1 +1 @@ -Subproject commit 71ded2fc978e4a32c0458ffd3a6887b6194e0f9a48b800c3bf49b69ef3451f99 +Subproject commit 2208652a59fe8a120246e1e4887b684f7345d1557c98c60303c39ab5dab3afcb diff --git a/perl-Module-Metadata b/perl-Module-Metadata index b9ebae4..fa01eeb 160000 --- a/perl-Module-Metadata +++ b/perl-Module-Metadata @@ -1 +1 @@ -Subproject commit b9ebae492789f6103f54b20682a4275bcf7e2e9faf558b49574e3502383451e2 +Subproject commit fa01eebbb62594db34138d47345fba3dc6f92143b8cc37780bc86150fa0fd13a diff --git a/perl-Module-Runtime b/perl-Module-Runtime index 69fa382..aabd077 160000 --- a/perl-Module-Runtime +++ b/perl-Module-Runtime @@ -1 +1 @@ -Subproject commit 69fa382f9c72bbe5a74109f53992f2f8e545ed64b8fc8896ddca1c5dadc740a0 +Subproject commit aabd077eb7a403b00daa55a8cf8cc16020d4c846dd041f075d308cc250873f4b diff --git a/perl-Pod-Coverage b/perl-Pod-Coverage index fbd4794..2d9e9f7 160000 --- a/perl-Pod-Coverage +++ b/perl-Pod-Coverage @@ -1 +1 @@ -Subproject commit fbd479471ea08bd066fbb338803948b5f31fcbf6ae5508a341cba354e11c6268 +Subproject commit 2d9e9f72be9c0873d20526d2dd7e42362ce17c8373c04594d11c5e7f6a1de96a diff --git a/perl-Sub-Uplevel b/perl-Sub-Uplevel index 6503481..0265e55 160000 --- a/perl-Sub-Uplevel +++ b/perl-Sub-Uplevel @@ -1 +1 @@ -Subproject commit 65034814b12c5f0168e31a085ff2ec6be3a5c8c25e4939b0de2124a3bad08f4f +Subproject commit 0265e5576e257e00a82cc443ee50b0ff732f6d0b038eb3d2ffa61af9772a8091 diff --git a/perl-Test-Class b/perl-Test-Class index acfc121..2f36d0c 160000 --- a/perl-Test-Class +++ b/perl-Test-Class @@ -1 +1 @@ -Subproject commit acfc121aa642671d2855f6dc01a988cf974b345df6bc4924225d08915d7a2c00 +Subproject commit 2f36d0cea571d0e3b2f1e25d00e229c16fa508d7ec1127a80c5251b5de6ad4fb diff --git a/perl-Test-Compile b/perl-Test-Compile index df4302c..d7d9b40 160000 --- a/perl-Test-Compile +++ b/perl-Test-Compile @@ -1 +1 @@ -Subproject commit df4302cbb3ee691b6bc3ebc9b289d82c2851e96bef8b029a77e3c6172048048a +Subproject commit d7d9b40097d8cd12327f16d909125c0a836e73fa5132c851582a254d92430160 diff --git a/perl-Test-Deep b/perl-Test-Deep index aafd831..fd8848c 160000 --- a/perl-Test-Deep +++ b/perl-Test-Deep @@ -1 +1 @@ -Subproject commit aafd8319a810f395be24679da3d1a0cfe6016a2cb26ebb22c712b4002a0170dc +Subproject commit fd8848c5f463dac77e070c7ef6ea8dfa8df736dc8f17f1ff184223f65c8962e2 diff --git a/perl-Test-Differences b/perl-Test-Differences index 8330967..af6728b 160000 --- a/perl-Test-Differences +++ b/perl-Test-Differences @@ -1 +1 @@ -Subproject commit 833096751fdce37013af4c3e2ab52f938e64bc0af03001357e5b27999702def2 +Subproject commit af6728ba339c90d595cadc33812936bef16c90e363b38c57c0aea0ca675c9d3e diff --git a/perl-Test-Exception b/perl-Test-Exception index 975c088..4ee7e2c 160000 --- a/perl-Test-Exception +++ b/perl-Test-Exception @@ -1 +1 @@ -Subproject commit 975c088f21b991591c082bd1d0172364e4132520b3b0e08ae360cdabbbd2ad75 +Subproject commit 4ee7e2c19287076c1dc206af44541935022a5eadb539fe09fc9f01f4dc2819d0 diff --git a/perl-Test-Most b/perl-Test-Most index 4469d9a..2043808 160000 --- a/perl-Test-Most +++ b/perl-Test-Most @@ -1 +1 @@ -Subproject commit 4469d9adf1a0dc18e5f67571fbcc9655686be3e362c46ce85a784b0b3ff713f1 +Subproject commit 2043808c7e10bcce7f788c54810e11a5171930e8053c383da99b054fb62238a1 diff --git a/perl-Test-Pod b/perl-Test-Pod index 0c87d35..bb1add8 160000 --- a/perl-Test-Pod +++ b/perl-Test-Pod @@ -1 +1 @@ -Subproject commit 0c87d3505a230d6780e0e9162c8df983f5bc7f072deda2bf6db7ef657211c5df +Subproject commit bb1add81a97a939d9686f323ac9b5370f932265783e1596a430a87cc8eda8c19 diff --git a/perl-Test-Pod-Coverage b/perl-Test-Pod-Coverage index 8015f9f..46f534d 160000 --- a/perl-Test-Pod-Coverage +++ b/perl-Test-Pod-Coverage @@ -1 +1 @@ -Subproject commit 8015f9fafc5d976365307ec1e30f903180afa819dc8e1cbf12dc85ba931c038d +Subproject commit 46f534d815e4ab3df9866f1dc3b8fb270a559287d4f2c75589c79fe21908b0d6 diff --git a/perl-Test-Warn b/perl-Test-Warn index 8125187..9b6d758 160000 --- a/perl-Test-Warn +++ b/perl-Test-Warn @@ -1 +1 @@ -Subproject commit 81251873c8a0c2c1584ae6b4ecd628f22b5b926ae5d04c78c811317938b211a8 +Subproject commit 9b6d758ee01ffe75376702682ab465076459e8ce54e53f767cb5a9c1cc31cd83 diff --git a/perl-Text-Diff b/perl-Text-Diff index c204670..f469da6 160000 --- a/perl-Text-Diff +++ b/perl-Text-Diff @@ -1 +1 @@ -Subproject commit c204670e56e7aeae9ff59574fc7b5969a7aa600ba744e6240d5e94f5ac738077 +Subproject commit f469da66ccd10fca6d5df40be4cbac4e14ca8db7ac4fc94319837cf93a83ea4d diff --git a/perl-Try-Tiny b/perl-Try-Tiny index 810f750..248e26e 160000 --- a/perl-Try-Tiny +++ b/perl-Try-Tiny @@ -1 +1 @@ -Subproject commit 810f75057d28e6761124a320a161cc96a666041ade5128bd5d85cb5dbf6a1f68 +Subproject commit 248e26ec932705af30126e2ba256dcc07c3465970ae3fffe696c39c1593cb974 diff --git a/perl-UNIVERSAL-require b/perl-UNIVERSAL-require index 76f0fb8..81de4e7 160000 --- a/perl-UNIVERSAL-require +++ b/perl-UNIVERSAL-require @@ -1 +1 @@ -Subproject commit 76f0fb8a0c720ad2cce82f4f1621a76ca34a4bcf2f29c66186bd170bca70cec2 +Subproject commit 81de4e7f53463390cc27957e7a6009397fd6c22e607805aa44466043e821c033 diff --git a/saltbundlepy-pyasn1 b/saltbundlepy-pyasn1 index e819346..19d96bc 160000 --- a/saltbundlepy-pyasn1 +++ b/saltbundlepy-pyasn1 @@ -1 +1 @@ -Subproject commit e8193466eed2de72043afea19c899afb4e5e1a2d3ab1242736a26f78ee59faa1 +Subproject commit 19d96bcbbbb30801832a114ec400633e2a819cb6012de8d338deffc4ccfa7ce0 diff --git a/saltbundlepy-pyasn1-modules b/saltbundlepy-pyasn1-modules index d165e9e..cb15286 160000 --- a/saltbundlepy-pyasn1-modules +++ b/saltbundlepy-pyasn1-modules @@ -1 +1 @@ -Subproject commit d165e9e8aeed6a22d8464a18c0b3b282e0fdc0e623f95a85ab2373d60fe4ca97 +Subproject commit cb152869e82ab2d8d66a30fd51f9e9fb4eb4107e33bba589095db8bb805a720a diff --git a/saltbundlepy-websocket-client b/saltbundlepy-websocket-client index 404ed25..8cca856 160000 --- a/saltbundlepy-websocket-client +++ b/saltbundlepy-websocket-client @@ -1 +1 @@ -Subproject commit 404ed25384762596dfe9f297e2ff5d31271dc73c828764d342b502f7c0cb9a56 +Subproject commit 8cca85603ce4e1dcdd3f496074fb8fd6a04c90d28829c45e90c3b1d7f291dd96 diff --git a/staging.config b/staging.config new file mode 100644 index 0000000..2e5b74f --- /dev/null +++ b/staging.config @@ -0,0 +1,4 @@ +{ + "ObsProject": "systemsmanagement:saltstack:bundle:scm:testing", + "StagingProject": "systemsmanagement:saltstack:bundle:scm:testing:PullRequest" +} diff --git a/venv-salt-minion b/venv-salt-minion index b45efb4..fca15a9 160000 --- a/venv-salt-minion +++ b/venv-salt-minion @@ -1 +1 @@ -Subproject commit b45efb404ecaefa0f04e1d53faddcc3096dd6f6ea04226a53396edc53d08c264 +Subproject commit fca15a9979061283e1a91f70b65cef6a316a321ba9ee122b205414737dbc8452 diff --git a/workflow.config b/workflow.config new file mode 100644 index 0000000..1554c59 --- /dev/null +++ b/workflow.config @@ -0,0 +1,7 @@ +{ + "Workflows": ["direct", "pr"], + "Organization": "saltbundle", + "Branch": "bundle_testing", + "GitProjectName": "saltbundle/_ObsPrj#bundle_testing", + "ManualMergeProject": true +}