Merging

PR: saltbundle/_ObsPrj!155

.gitmodules

@@ -518,22 +518,6 @@
 	path = fdupes
 	url = ../fdupes
 	branch = bundle_next
-[submodule "saltbundlepy-apt-debian11-12"]
-	path = saltbundlepy-apt-debian11-12
-	url = ../saltbundlepy-apt-debian11-12
-	branch = bundle_next
-[submodule "saltbundlepy-apt-ubuntu2004"]
-	path = saltbundlepy-apt-ubuntu2004
-	url = ../saltbundlepy-apt-ubuntu2004
-	branch = bundle_next
-[submodule "saltbundlepy-apt-ubuntu2204"]
-	path = saltbundlepy-apt-ubuntu2204
-	url = ../saltbundlepy-apt-ubuntu2204
-	branch = bundle_next
-[submodule "saltbundlepy-apt-ubuntu2404"]
-	path = saltbundlepy-apt-ubuntu2404
-	url = ../saltbundlepy-apt-ubuntu2404
-	branch = bundle_next
 [submodule "saltbundlepy-libvirt-sle16"]
 	path = saltbundlepy-libvirt-sle16
 	url = ../saltbundlepy-libvirt-sle16

_config

@@ -11,6 +11,11 @@ Substitute: pkgconfig(ncurses) ncurses-devel
 
 FileProvides: /usr/bin/who coreutils
 
+# workaround for https://bugzilla.suse.com/show_bug.cgi?id=1256696
+%ifarch ppc64 ppc64le
+Constraint: hardware:cpu:flag power9
+%endif
+
 Macros:
 %make_build /usr/bin/make V=1 VERBOSE=1
 %saltbundlepy_module() saltbundlepy-%{**}
@@ -321,6 +326,86 @@ Macros:
 :Macros
 %endif
 
+############################################################
+##################### Debian13 #############################
+############################################################
+%if 0%{?debian} == 13
+Repotype: debian
+Type: spec
+BinaryType: deb
+BuildEngine: debbuild
+Support: debbuild pax
+Keep: debbuild
+
+######## START salt bundle
+Prefer: fakeroot
+Prefer: cron
+
+Required: debbuild-macros
+
+Ignore: lsb-release:python3
+
+Substitute: boost-devel libboost-dev
+Substitute: ca-certificates-mozilla ca-certificates
+Substitute: gdbm-devel libgdbm-dev
+Substitute: gmp-devel libgmp-dev
+Substitute: libcurl-devel libcurl4-openssl-dev
+Substitute: libopenssl-devel libssl-dev
+Substitute: libyaml-devel libyaml-dev
+Substitute: lzma-devel liblzma-dev
+Substitute: netcfg netbase
+Substitute: openssl-devel libssl-dev
+Substitute: pcre-devel libpcre3-dev
+Substitute: sqlite-devel libsqlite3-dev
+Substitute: timezone tzdata
+Substitute: xz xz-utils
+
+# mlatini 24-05-2024
+# saltbundlepy-psutil needs this
+# https://github.com/SUSE/spacewalk/issues/24384
+Substitute: /usr/bin/who coreutils
+
+Substitute: pkgconfig(bzip2) libbz2-dev
+Substitute: pkgconfig(expat) libexpat1-dev
+Substitute: pkgconfig(libffi) libffi-dev
+Substitute: pkgconfig(ncurses) ncurses-dev
+Substitute: pkgconfig(tk) tk-dev
+Substitute: pkgconfig(uuid) uuid-dev
+Substitute: pkgconfig(x11) libx11-dev
+Substitute: pkgconfig(zlib) zlib1g-dev
+
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.deb$
+######## End salt bundle
+
+######## Start Lua substitutes
+Substitute: readline-devel libreadline-dev
+######## End Lua substitutes
+
+######## Start Other substitutes
+Substitute: pkgconfig pkg-config
+Substitute: update-alternatives dpkg
+######## End Other substitutes
+
+######## Start of Lua Prefer and Preinstall
+Preinstall: libtool-bin
+Preinstall: liblua5-1-5 perl-lua-api
+Prefer: lua5.1
+######## End of Lua Prefer and Preinstall
+
+Macros:
+######## START of macros for salt bundle packages
+%_vendor debbuild
+
+%_lib lib
+%_gnu -gnu
+%_defaultlicensedir /usr/share/licenses
+%_deb_maintainer Uyuni packagers <devel@lists.uyuni-project.org>
+%_rpmconfigdir /usr/lib/rpm
+%_buildshell /bin/bash
+######## End of macros for salt bundle packages
+:Macros
+%endif
+
 ############################################################
 ##################### Ubuntu2404 ###########################
 ############################################################