Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2018-03-30 12:02:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Fri Mar 30 12:02:25 2018 rev:275 rq:592081 version:237
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2018-03-16
10:38:35.938735605 +0100
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes
2018-03-30 12:02:27.760494873 +0200
@@ -1,0 +2,83 @@
+Wed Mar 28 15:19:45 UTC 2018 - f...@suse.com
+
+- Drop systemd-bash-completion sub-package
+
+ Now we directly ship the completion scripts from the main package as
+ we already do for zsh. I couldn't see any advantages in this split.
+
+-------------------------------------------------------------------
+Wed Mar 28 15:12:26 UTC 2018 - f...@suse.com
+
+- Be more accurate when specifiying the tools version we provide
+
+-------------------------------------------------------------------
+Wed Mar 28 15:00:24 UTC 2018 - f...@suse.com
+
+- Make sure rpm won't expand %autopatch even if it's commented
+
+-------------------------------------------------------------------
+Wed Mar 28 14:55:36 UTC 2018 - f...@suse.com
+
+- stat(1) as well as systemctl are not use in %post section of udev
+
+ So remove stat(1) from the list of dep and move systemctl to the
+ requirements of %postun since it's called from there.
+
+-------------------------------------------------------------------
+Wed Mar 28 12:30:31 UTC 2018 - f...@suse.com
+
+- Import commit 14b3e00c3ccb8c1c82c8a2e99a9534750880a09e
+
+ e0a8285e2 pid1: when creating service directories, don't chown existing
files (#8181) (boo#1085971)
+ fb25886b1 Fix format-truncation compile failure by typecasting USB IDs
(#8250) (bsc#1084638)
+ 5a6e9c92e sysusers: make sure to reset errno before calling fget*ent()
+ c2e1ee488 sysusers: also add support for NIS entries in /etc/shadow
+ 51cb94fa1 sysusers: do not append entries after the NIS ones (bsc#1085062
bsc#1045092)
+ 783f3d368 basic/macros: rename noreturn into _noreturn_ (#8456)
+
+- Drop 0001-basic-macros-rename-noreturn-into-_noreturn_.patch
+
+ It's been merged in the git repo.
+
+-------------------------------------------------------------------
+Wed Mar 28 12:13:03 UTC 2018 - f...@suse.com
+
+- Rename the tarball
+
+ So it's clear that it contains some additional patches on top of the
+ upstream version. Use the commit hash in the name so the exact
+ version can easily be identified.
+
+ Provide _service file which can be used to retrieve the tarball from
+ the git repo (with "osc service disabledrun").
+
+-------------------------------------------------------------------
+Wed Mar 28 11:58:10 UTC 2018 - f...@suse.com
+
+- Split systemd-coredump sub-package off (bsc#1083849)
+
+-------------------------------------------------------------------
+Tue Mar 27 15:58:34 UTC 2018 - f...@suse.com
+
+- Don't ship machines.target in systemd-container but in systemd main package
+
+ machines.target is supposed to be a standard target for
+ starting/stopping all containers. systemd-nspawn is the main user of
+ it but other container managers could also make use of it.
+
+-------------------------------------------------------------------
+Sun Mar 25 11:04:04 UTC 2018 - f...@suse.com
+
+- Build a mini variant of systemd-container
+
+ So we don't have to manually track and remove all files that should
+ be shipped by systemd-container in the case of a bootstrap build.
+
+-------------------------------------------------------------------
+Thu Mar 22 17:09:36 UTC 2018 - f...@suse.com
+
+- Run migrate-sysconfig-i18n.sh also during package installation (bsc#1086164)
+
+ This is needed when we upgrade from SLE11.
+
+-------------------------------------------------------------------
systemd.changes: same change
Old:
----
0001-basic-macros-rename-noreturn-into-_noreturn_.patch
systemd-237.tar.xz
New:
----
_service
systemd-v237+suse.52.g14b3e00c3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-mini.spec ++++++
--- /var/tmp/diff_new_pack.OzJbyU/_old 2018-03-30 12:02:28.964451338 +0200
+++ /var/tmp/diff_new_pack.OzJbyU/_new 2018-03-30 12:02:29.000450036 +0200
@@ -26,6 +26,7 @@
##### WARNING: please do not edit this auto generated spec file. Use the
systemd.spec! #####
%define mini -mini
%define min_kernel_version 4.5
+%define suse_version +suse.52.g14b3e00c3
%bcond_with gnuefi
%if 0%{?bootstrap}
@@ -120,7 +121,6 @@
Requires: udev = %{version}-%{release}
Requires: util-linux >= 2.27.1
Requires: group(lock)
-Recommends: %{name}-bash-completion
Requires(post): coreutils
Requires(post): findutils
Requires(post): systemd-presets-branding
@@ -135,10 +135,10 @@
Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0
Obsoletes: systemd-analyze < 201
-Provides: systemd-analyze = %{version}
+Provides: systemd-analyze = %{version}-%{release}
Obsoletes: pm-utils <= 1.4.1
Obsoletes: suspend <= 1.0
-Source0: systemd-%{version}.tar.xz
+Source0: systemd-v%{version}%{suse_version}.tar.xz
Source1: %{name}-rpmlintrc
Source2: systemd-user
Source3: systemd-sysv-convert
@@ -162,7 +162,6 @@
# broken in upstream and need an urgent fix. Even in this case, the
# patches are temporary and should be removed as soon as a fix is
# merged by upstream.
-Patch1: 0001-basic-macros-rename-noreturn-into-_noreturn_.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@@ -235,12 +234,10 @@
Group: System/Kernel
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
Requires: system-group-hardware
-Requires(pre): /usr/bin/stat
Requires(post): sed
-Requires(post): /usr/bin/systemctl
-
Requires(post): coreutils
Requires(postun): coreutils
+Requires(postun): /usr/bin/systemctl
Requires(posttrans): suse-module-tools >= 12.4
Conflicts: systemd < 39
@@ -252,7 +249,7 @@
Conflicts: ConsoleKit < 0.4.1
Requires: filesystem
%if 0%{?bootstrap}
-Provides: udev = %{version}
+Provides: udev = %{version}-%{release}
Conflicts: libudev1
Conflicts: udev
# avoid kiwi picking it for bootstrap
@@ -287,8 +284,8 @@
Group: Development/Libraries/Other
Requires: libudev%{?mini}1 = %{version}-%{release}
%if 0%{?bootstrap}
-Provides: libudev-devel = %{version}
-Conflicts: libudev1 = %{version}
+Provides: libudev-devel = %{version}-%{release}
+Conflicts: libudev1 = %{version}-%{release}
Conflicts: libudev-devel
%endif
@@ -296,15 +293,34 @@
This package contains the development files for the library libudev, a
dynamic library, which provides access to udev device information.
-%package container
+%package coredump%{mini}
+Summary: Systemd tools for coredump management
+License: LGPL-2.1-or-later
+Group: System/Base
+Requires: %{name} = %{version}-%{release}
+%systemd_requires
+Provides: systemd:%{_bindir}/coredumpctl
+%if 0%{?bootstrap}
+Conflicts: systemd-coredump
+%endif
+
+%description coredump%{mini}
+Systemd tools to store and manage coredumps.
+
+This package contains systemd-coredump, coredumpctl.
+
+%package container%{?mini}
Summary: Systemd tools for container management
License: LGPL-2.1-or-later
Group: System/Base
Requires: %{name} = %{version}-%{release}
%systemd_requires
Provides: systemd:%{_bindir}/systemd-nspawn
+%if 0%{?bootstrap}
+Conflicts: systemd-container
+%endif
-%description container
+%description container%{?mini}
Systemd tools to spawn and manage containers and virtual machines.
This package contains systemd-nspawn, machinectl, systemd-machined,
@@ -406,22 +422,9 @@
systemd-journal-remote, and systemd-journal-upload.
%endif
-%package bash-completion
-Summary: Bash completion support for systemd
-License: LGPL-2.1-or-later
-Group: System/Base
-Requires: bash-completion
-BuildArch: noarch
-%if 0%{?bootstrap}
-Conflicts: systemd-bash-completion
-%endif
-
-%description bash-completion
-Some systemd commands offer bash completion, but it is an optional dependency.
-
%prep
-%setup -q -n systemd-%{version}
-%autopatch -p1
+%setup -q -n systemd-v%{version}%{suse_version}
+# %%autopatch -p1
%build
opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
@@ -478,9 +481,6 @@
mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
%else
rm %{buildroot}%{_libdir}/libnss_systemd.so*
-rm %{buildroot}%{_bindir}/systemd-nspawn
-rm %{buildroot}%{_unitdir}/systemd-nspawn@.service
-rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf
%endif
# FIXME: these symlinks should die.
@@ -724,16 +724,15 @@
# This includes all hacks needed when upgrading from SysV.
%{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || :
-if [ $1 -gt 1 ]; then
- # Migrate i18n setting stuff thout could be previously
- # configured in /etc/sysconfig but now is defined only in the
- # systemd official places (/etc/locale.conf,
- # /etc/vconsole.conf, etc...). This is done only once.
- test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done
|| {
+# Migrate i18n settings that could be previously configured in
+# /etc/sysconfig but now is defined only in the systemd official
+# places (/etc/locale.conf, /etc/vconsole.conf, etc...). This is done
+# only once usually during package updates but might be also needed
+# during installations when we upgrade from a distro using SysV init.
+test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || {
%{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh &&
touch
%{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || :
- }
-fi
+}
%postun
%systemd_postun
@@ -789,8 +788,7 @@
%postun -n libudev%{?mini}1 -p /sbin/ldconfig
%postun -n libsystemd0%{?mini} -p /sbin/ldconfig
-%if ! 0%{?bootstrap}
-%post container
+%post container%{?mini}
%tmpfiles_create systemd-nspawn.conf
if [ $1 -gt 1 ]; then
# Convert /var/lib/machines subvolume to make it suitable for
@@ -811,6 +809,7 @@
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
fi
+%if ! 0%{?bootstrap}
%post logger
%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/
if [ "$1" -eq 1 ]; then
@@ -876,7 +875,6 @@
%{_bindir}/localectl
%{_bindir}/systemctl
%{_bindir}/systemd-analyze
-%{_bindir}/coredumpctl
%{_bindir}/systemd-delta
%{_bindir}/systemd-escape
%{_bindir}/systemd-firstboot
@@ -919,19 +917,22 @@
%exclude %{_prefix}/lib/systemd/systemd-journal-remote
%exclude %{_prefix}/lib/systemd/systemd-journal-upload
%endif
+%exclude %{_prefix}/lib/systemd/systemd-coredump
%exclude %{_prefix}/lib/systemd/systemd-sysv*
%exclude %{_prefix}/lib/systemd/systemd-udevd
%exclude %{_unitdir}/systemd-udev*.*
%exclude %{_unitdir}/*.target.wants/systemd-udev*.*
%exclude %{_unitdir}/initrd-udevadm-cleanup-db.service
%exclude %{_unitdir}/systemd-nspawn@.service
+%exclude %{_unitdir}/systemd-coredump*
+%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket
%if %{with machined}
%exclude %{_prefix}/lib/systemd/systemd-machined
%exclude %{_unitdir}/systemd-machined.service
%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service
%exclude %{_unitdir}/var-lib-machines.mount
%exclude %{_unitdir}/machine.slice
-%exclude %{_unitdir}/machines.target*
+%exclude %{_unitdir}/machines.target.wants
%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount
%endif
%if %{with importd}
@@ -1006,7 +1007,6 @@
%dir %{_sysctldir}
%dir %{_sysconfdir}/sysctl.d
-%{_sysctldir}/50-coredump.conf
%dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d
@@ -1022,7 +1022,6 @@
%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
%config(noreplace) %{_sysconfdir}/pam.d/systemd-user
-%config(noreplace) %{_sysconfdir}/systemd/coredump.conf
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
%config(noreplace) %{_sysconfdir}/systemd/system.conf
%config(noreplace) %{_sysconfdir}/systemd/logind.conf
@@ -1111,6 +1110,9 @@
%{_mandir}/man8/systemd-journald*
%{_mandir}/man8/systemd-u[ps]*
%{_mandir}/man8/30-systemd-environment-d-generator.*
+%exclude %{_mandir}/man1/coredumpctl*
+%exclude %{_mandir}/man5/coredump.conf*
+%exclude %{_mandir}/man8/systemd-coredump*
%exclude %{_mandir}/man*/*nspawn*
%if %{with machined}
%exclude %{_mandir}/man*/machinectl*
@@ -1129,11 +1131,15 @@
%dir %{_localstatedir}/lib/systemd
%dir %{_localstatedir}/lib/systemd/sysv-convert
%dir %{_localstatedir}/lib/systemd/migrated
-%dir %{_localstatedir}/lib/systemd/coredump
%dir %{_localstatedir}/lib/systemd/catalog
%ghost %{_localstatedir}/lib/systemd/catalog/database
%ghost %{_localstatedir}/lib/systemd/backlight
%ghost %{_localstatedir}/lib/systemd/random-seed
+
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/*
+
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/*
@@ -1239,8 +1245,21 @@
%{_mandir}/man3/*udev*.3*
%endif
+%files coredump%{?mini}
+%defattr(-,root,root)
+%{_bindir}/coredumpctl
+%{_unitdir}/systemd-coredump*
+%{_unitdir}/sockets.target.wants/systemd-coredump.socket
+%{_sysctldir}/50-coredump.conf
+%config(noreplace) %{_sysconfdir}/systemd/coredump.conf
+%dir %{_localstatedir}/lib/systemd/coredump
%if ! 0%{?bootstrap}
-%files container
+%{_mandir}/man1/coredumpctl*
+%{_mandir}/man5/coredump.conf*
+%{_mandir}/man8/systemd-coredump*
+%endif
+
+%files container%{?mini}
%defattr(-,root,root)
%{_bindir}/systemd-nspawn
%{_unitdir}/systemd-nspawn@.service
@@ -1252,7 +1271,7 @@
%{_unitdir}/dbus-org.freedesktop.machine1.service
%{_unitdir}/var-lib-machines.mount
%{_unitdir}/machine.slice
-%{_unitdir}/machines.target*
+%{_unitdir}/machines.target.wants
%{_unitdir}/*.target.wants/var-lib-machines.mount
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh
%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
@@ -1269,6 +1288,7 @@
%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
%endif
+%if ! 0%{?bootstrap}
%{_mandir}/man*/*nspawn*
%if %{with machined}
%{_mandir}/man*/machinectl*
@@ -1277,7 +1297,9 @@
%if %{with importd}
%{_mandir}/man*/systemd-importd*
%endif
+%endif
+%if ! 0%{?bootstrap}
%files logger
%defattr(-,root,root)
%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/
@@ -1330,10 +1352,4 @@
%{_datadir}/systemd/gatewayd
%endif
-%files bash-completion
-%defattr(-,root,root,-)
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/*
-
%changelog
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.OzJbyU/_old 2018-03-30 12:02:29.132445263 +0200
+++ /var/tmp/diff_new_pack.OzJbyU/_new 2018-03-30 12:02:29.136445118 +0200
@@ -24,6 +24,7 @@
%define bootstrap 0
%define mini %nil
%define min_kernel_version 4.5
+%define suse_version +suse.52.g14b3e00c3
%bcond_with gnuefi
%if 0%{?bootstrap}
@@ -118,7 +119,6 @@
Requires: udev = %{version}-%{release}
Requires: util-linux >= 2.27.1
Requires: group(lock)
-Recommends: %{name}-bash-completion
Requires(post): coreutils
Requires(post): findutils
Requires(post): systemd-presets-branding
@@ -133,10 +133,10 @@
Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0
Obsoletes: systemd-analyze < 201
-Provides: systemd-analyze = %{version}
+Provides: systemd-analyze = %{version}-%{release}
Obsoletes: pm-utils <= 1.4.1
Obsoletes: suspend <= 1.0
-Source0: systemd-%{version}.tar.xz
+Source0: systemd-v%{version}%{suse_version}.tar.xz
Source1: %{name}-rpmlintrc
Source2: systemd-user
Source3: systemd-sysv-convert
@@ -160,7 +160,6 @@
# broken in upstream and need an urgent fix. Even in this case, the
# patches are temporary and should be removed as soon as a fix is
# merged by upstream.
-Patch1: 0001-basic-macros-rename-noreturn-into-_noreturn_.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@@ -233,12 +232,10 @@
Group: System/Kernel
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
Requires: system-group-hardware
-Requires(pre): /usr/bin/stat
Requires(post): sed
-Requires(post): /usr/bin/systemctl
-
Requires(post): coreutils
Requires(postun): coreutils
+Requires(postun): /usr/bin/systemctl
Requires(posttrans): suse-module-tools >= 12.4
Conflicts: systemd < 39
@@ -250,7 +247,7 @@
Conflicts: ConsoleKit < 0.4.1
Requires: filesystem
%if 0%{?bootstrap}
-Provides: udev = %{version}
+Provides: udev = %{version}-%{release}
Conflicts: libudev1
Conflicts: udev
# avoid kiwi picking it for bootstrap
@@ -285,8 +282,8 @@
Group: Development/Libraries/Other
Requires: libudev%{?mini}1 = %{version}-%{release}
%if 0%{?bootstrap}
-Provides: libudev-devel = %{version}
-Conflicts: libudev1 = %{version}
+Provides: libudev-devel = %{version}-%{release}
+Conflicts: libudev1 = %{version}-%{release}
Conflicts: libudev-devel
%endif
@@ -294,15 +291,34 @@
This package contains the development files for the library libudev, a
dynamic library, which provides access to udev device information.
-%package container
+%package coredump%{mini}
+Summary: Systemd tools for coredump management
+License: LGPL-2.1-or-later
+Group: System/Base
+Requires: %{name} = %{version}-%{release}
+%systemd_requires
+Provides: systemd:%{_bindir}/coredumpctl
+%if 0%{?bootstrap}
+Conflicts: systemd-coredump
+%endif
+
+%description coredump%{mini}
+Systemd tools to store and manage coredumps.
+
+This package contains systemd-coredump, coredumpctl.
+
+%package container%{?mini}
Summary: Systemd tools for container management
License: LGPL-2.1-or-later
Group: System/Base
Requires: %{name} = %{version}-%{release}
%systemd_requires
Provides: systemd:%{_bindir}/systemd-nspawn
+%if 0%{?bootstrap}
+Conflicts: systemd-container
+%endif
-%description container
+%description container%{?mini}
Systemd tools to spawn and manage containers and virtual machines.
This package contains systemd-nspawn, machinectl, systemd-machined,
@@ -404,22 +420,9 @@
systemd-journal-remote, and systemd-journal-upload.
%endif
-%package bash-completion
-Summary: Bash completion support for systemd
-License: LGPL-2.1-or-later
-Group: System/Base
-Requires: bash-completion
-BuildArch: noarch
-%if 0%{?bootstrap}
-Conflicts: systemd-bash-completion
-%endif
-
-%description bash-completion
-Some systemd commands offer bash completion, but it is an optional dependency.
-
%prep
-%setup -q -n systemd-%{version}
-%autopatch -p1
+%setup -q -n systemd-v%{version}%{suse_version}
+# %%autopatch -p1
%build
opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
@@ -476,9 +479,6 @@
mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
%else
rm %{buildroot}%{_libdir}/libnss_systemd.so*
-rm %{buildroot}%{_bindir}/systemd-nspawn
-rm %{buildroot}%{_unitdir}/systemd-nspawn@.service
-rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf
%endif
# FIXME: these symlinks should die.
@@ -722,16 +722,15 @@
# This includes all hacks needed when upgrading from SysV.
%{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || :
-if [ $1 -gt 1 ]; then
- # Migrate i18n setting stuff thout could be previously
- # configured in /etc/sysconfig but now is defined only in the
- # systemd official places (/etc/locale.conf,
- # /etc/vconsole.conf, etc...). This is done only once.
- test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done
|| {
+# Migrate i18n settings that could be previously configured in
+# /etc/sysconfig but now is defined only in the systemd official
+# places (/etc/locale.conf, /etc/vconsole.conf, etc...). This is done
+# only once usually during package updates but might be also needed
+# during installations when we upgrade from a distro using SysV init.
+test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || {
%{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh &&
touch
%{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || :
- }
-fi
+}
%postun
%systemd_postun
@@ -787,8 +786,7 @@
%postun -n libudev%{?mini}1 -p /sbin/ldconfig
%postun -n libsystemd0%{?mini} -p /sbin/ldconfig
-%if ! 0%{?bootstrap}
-%post container
+%post container%{?mini}
%tmpfiles_create systemd-nspawn.conf
if [ $1 -gt 1 ]; then
# Convert /var/lib/machines subvolume to make it suitable for
@@ -809,6 +807,7 @@
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
fi
+%if ! 0%{?bootstrap}
%post logger
%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/
if [ "$1" -eq 1 ]; then
@@ -874,7 +873,6 @@
%{_bindir}/localectl
%{_bindir}/systemctl
%{_bindir}/systemd-analyze
-%{_bindir}/coredumpctl
%{_bindir}/systemd-delta
%{_bindir}/systemd-escape
%{_bindir}/systemd-firstboot
@@ -917,19 +915,22 @@
%exclude %{_prefix}/lib/systemd/systemd-journal-remote
%exclude %{_prefix}/lib/systemd/systemd-journal-upload
%endif
+%exclude %{_prefix}/lib/systemd/systemd-coredump
%exclude %{_prefix}/lib/systemd/systemd-sysv*
%exclude %{_prefix}/lib/systemd/systemd-udevd
%exclude %{_unitdir}/systemd-udev*.*
%exclude %{_unitdir}/*.target.wants/systemd-udev*.*
%exclude %{_unitdir}/initrd-udevadm-cleanup-db.service
%exclude %{_unitdir}/systemd-nspawn@.service
+%exclude %{_unitdir}/systemd-coredump*
+%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket
%if %{with machined}
%exclude %{_prefix}/lib/systemd/systemd-machined
%exclude %{_unitdir}/systemd-machined.service
%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service
%exclude %{_unitdir}/var-lib-machines.mount
%exclude %{_unitdir}/machine.slice
-%exclude %{_unitdir}/machines.target*
+%exclude %{_unitdir}/machines.target.wants
%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount
%endif
%if %{with importd}
@@ -1004,7 +1005,6 @@
%dir %{_sysctldir}
%dir %{_sysconfdir}/sysctl.d
-%{_sysctldir}/50-coredump.conf
%dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d
@@ -1020,7 +1020,6 @@
%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
%config(noreplace) %{_sysconfdir}/pam.d/systemd-user
-%config(noreplace) %{_sysconfdir}/systemd/coredump.conf
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
%config(noreplace) %{_sysconfdir}/systemd/system.conf
%config(noreplace) %{_sysconfdir}/systemd/logind.conf
@@ -1109,6 +1108,9 @@
%{_mandir}/man8/systemd-journald*
%{_mandir}/man8/systemd-u[ps]*
%{_mandir}/man8/30-systemd-environment-d-generator.*
+%exclude %{_mandir}/man1/coredumpctl*
+%exclude %{_mandir}/man5/coredump.conf*
+%exclude %{_mandir}/man8/systemd-coredump*
%exclude %{_mandir}/man*/*nspawn*
%if %{with machined}
%exclude %{_mandir}/man*/machinectl*
@@ -1127,11 +1129,15 @@
%dir %{_localstatedir}/lib/systemd
%dir %{_localstatedir}/lib/systemd/sysv-convert
%dir %{_localstatedir}/lib/systemd/migrated
-%dir %{_localstatedir}/lib/systemd/coredump
%dir %{_localstatedir}/lib/systemd/catalog
%ghost %{_localstatedir}/lib/systemd/catalog/database
%ghost %{_localstatedir}/lib/systemd/backlight
%ghost %{_localstatedir}/lib/systemd/random-seed
+
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/*
+
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/*
@@ -1237,8 +1243,21 @@
%{_mandir}/man3/*udev*.3*
%endif
+%files coredump%{?mini}
+%defattr(-,root,root)
+%{_bindir}/coredumpctl
+%{_unitdir}/systemd-coredump*
+%{_unitdir}/sockets.target.wants/systemd-coredump.socket
+%{_sysctldir}/50-coredump.conf
+%config(noreplace) %{_sysconfdir}/systemd/coredump.conf
+%dir %{_localstatedir}/lib/systemd/coredump
%if ! 0%{?bootstrap}
-%files container
+%{_mandir}/man1/coredumpctl*
+%{_mandir}/man5/coredump.conf*
+%{_mandir}/man8/systemd-coredump*
+%endif
+
+%files container%{?mini}
%defattr(-,root,root)
%{_bindir}/systemd-nspawn
%{_unitdir}/systemd-nspawn@.service
@@ -1250,7 +1269,7 @@
%{_unitdir}/dbus-org.freedesktop.machine1.service
%{_unitdir}/var-lib-machines.mount
%{_unitdir}/machine.slice
-%{_unitdir}/machines.target*
+%{_unitdir}/machines.target.wants
%{_unitdir}/*.target.wants/var-lib-machines.mount
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh
%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
@@ -1267,6 +1286,7 @@
%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
%endif
+%if ! 0%{?bootstrap}
%{_mandir}/man*/*nspawn*
%if %{with machined}
%{_mandir}/man*/machinectl*
@@ -1275,7 +1295,9 @@
%if %{with importd}
%{_mandir}/man*/systemd-importd*
%endif
+%endif
+%if ! 0%{?bootstrap}
%files logger
%defattr(-,root,root)
%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/
@@ -1328,10 +1350,4 @@
%{_datadir}/systemd/gatewayd
%endif
-%files bash-completion
-%defattr(-,root,root,-)
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/*
-
%changelog
++++++ _service ++++++
<!-- See https://en.opensuse.org/openSUSE:Build_Service_Concept_SourceService
-->
<!-- for more details on the syntax -->
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param
name="url">https://github.com/openSUSE/systemd.git</param>
<param name="filename">systemd</param>
<param
name="versionformat">@PARENT_TAG@+suse.@TAG_OFFSET@.g%h</param>
<param name="revision">openSUSE-Factory</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*systemd-v237+suse.*.tar</param>
<param name="compression">xz</param>
</service>
</services>
