Forwarded PRs: #52

Closed
autogits-devel wants to merge 33 commits from PR_deb-perl-macros#2 into bundle_next
42 changed files with 75 additions and 60 deletions

45
_config
View File

@@ -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
############################################################

3
_maintainership.json Normal file
View File

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

2
fdupes

Submodule fdupes updated: c7ff5ad4b6...dc6e840984

2
lua51

Submodule lua51 updated: cdcf0f0c82...5d6c7154dc

4
staging.config Normal file
View File

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

7
workflow.config Normal file
View File

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