- Convert systemd package to multibuild

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1206

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+    <package>mini</package>
+</multibuild>

pre_checkin.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# This script is based on libcdio_spec-prepare.sh (thanks to sbrabec@suse.cz)
-# create a -mini spec for systemd for bootstrapping
-
-ORIG_SPEC=systemd
-EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ${ORIG_SPEC}.spec! #####\n"
-sed "s/^%define bootstrap .*$/${EDIT_WARNING}%define bootstrap 1/;
-     s/^%define mini .*$/${EDIT_WARNING}%define mini -mini/;
-     s/^Name:.*/&-mini/
-	      " < ${ORIG_SPEC}.spec > ${ORIG_SPEC}-mini.spec
-cp ${ORIG_SPEC}.changes ${ORIG_SPEC}-mini.changes
-cp ${ORIG_SPEC}-rpmlintrc ${ORIG_SPEC}-mini-rpmlintrc
-
-osc service localrun format_spec_file

systemd-mini-rpmlintrc

@@ -1,11 +0,0 @@
-addFilter(".*filelist-forbidden-systemd-userdirs /etc/systemd/.*\.conf")
-addFilter(".*dbus-policy-allow-receive")
-addFilter(".*devel-file-in-non-devel-package.*udev.pc.*")
-addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*")
-addFilter(".*missing-call-to-setgroups-before-setuid.*")
-addFilter(".*systemd-service-without-service.*")
-addFilter("env-script-interpreter")
-addFilter(".*files-duplicate /usr/lib/systemd/.*")
-addFilter(".*files-duplicated-waste.*")
-addFilter(".*explicit-lib-dependency .*")
-addFilter(".*tmpfile-not-in-filelist .*")

systemd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 18 10:06:08 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Convert systemd package to multibuild
+
 -------------------------------------------------------------------
 Fri Oct 15 12:09:44 UTC 2021 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -21,8 +21,16 @@
 # found at: https://github.com/openSUSE/systemd.
 #
 
+%global flavor @BUILD_FLAVOR@%{nil}
+
+%if "%{flavor}" == "mini"
+%define bootstrap 1
+%define mini -mini
+%else
 %define bootstrap 0
 %define mini %nil
+%endif
+
 %define min_kernel_version 4.5
 %define suse_version +suse.47.g8521f8d22f
 %define _testsuitedir /usr/lib/systemd/tests
@@ -59,7 +67,7 @@
 # Kept to ease migrations toward SLE
 %bcond_with     split_usr
 
-Name:           systemd
+Name:           systemd%{?mini}
 URL:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        249.5
 Release:        0
@@ -163,7 +171,7 @@ Obsoletes:      pm-utils <= 1.4.1
 Obsoletes:      suspend <= 1.0
 Obsoletes:      systemd-analyze < 201
 Source0:        systemd-v%{version}%{suse_version}.tar.xz
-Source1:        %{name}-rpmlintrc
+Source1:        systemd-rpmlintrc
 Source2:        systemd-user
 %if %{with sysvcompat}
 Source3:        systemd-sysv-convert