do not make systemd-cpredump sub packages

systemd.spec

@@ -20,7 +20,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        249
-Release:        2
+Release:        3
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -286,18 +286,6 @@ Requires:       %{name} = %{version}-%{release}
 %description pam
 Systemd PAM module registers the session with systemd-logind.
 
-%package coredump
-Summary:        Systemd tools for coredump management
-License:        LGPLv2+
-Requires:       %{name} = %{version}-%{release}
-%systemd_requires
-Provides:       systemd:%{_bindir}/coredumpctl
-
-%description coredump
-Systemd tools to store and manage coredumps.
-
-This package contains systemd-coredump, coredumpctl.
-
 %package portable
 Summary:        Systemd tools for portable services
 License:        LGPLv2+
@@ -650,7 +638,6 @@ getent group kvm &>/dev/null || groupadd -r -g 36 kvm &>/dev/null || :
 getent group render &>/dev/null || groupadd -r render &>/dev/null || :
 getent group systemd-journal &>/dev/null || groupadd -r -g 190 systemd-journal 2>&1 || :
 
-%pre coredump
 getent group systemd-coredump &>/dev/null || groupadd -r systemd-coredump 2>&1 || :
 getent passwd systemd-coredump &>/dev/null || useradd -r -l -g systemd-coredump -d / -s /sbin/nologin -c "systemd Core Dumper" systemd-coredump &>/dev/null || :
 
@@ -885,6 +872,7 @@ fi
 %ghost %attr(0700,root,root) %dir /var/lib/private
 %dir /var/lib/systemd
 %dir /var/lib/systemd/catalog
+%ghost %dir /var/lib/systemd/coredump
 %ghost %dir /var/lib/systemd/linger
 %ghost /var/lib/systemd/catalog/database
 %ghost %dir /var/lib/private/systemd
@@ -989,6 +977,7 @@ fi
 /usr/bin/systemd-sysusers
 /usr/bin/systemd-tty-ask-password-agent
 /usr/bin/busctl
+/usr/bin/coredumpctl
 %dir /usr/lib/environment.d
 %dir /usr/lib/binfmt.d
 %dir /usr/lib/tmpfiles.d
@@ -1036,6 +1025,7 @@ fi
 %dir %{_systemddir}/user-generators
 %{_systemddir}/systemd
 %dir %{_systemddir}/user-preset
+%{_systemddir}/systemd-coredump
 %{_systemddir}/systemd-veritysetup
 %{_systemddir}/systemd-network-generator
 %{_systemddir}/systemd-binfmt
@@ -1044,6 +1034,8 @@ fi
 %{_unitdir}/systemd-binfmt.service
 %{_unitdir}/systemd-machine-id-commit.service
 %dir %{_unitdir}/basic.target.wants
+%{_unitdir}/systemd-coredump.socket
+%{_unitdir}/systemd-coredump@.service
 %{_unitdir}/ctrl-alt-del.target
 %{_unitdir}/systemd-tmpfiles-setup.service
 %{_unitdir}/rpcbind.target
@@ -1276,6 +1268,7 @@ fi
 %{_systemddir}/user/xdg-desktop-autostart.target
 /usr/lib/sysctl.d/50-default.conf
 /usr/lib/sysctl.d/50-pid-max.conf
+/usr/lib/sysctl.d/50-coredump.conf
 /usr/lib/tmpfiles.d/systemd-tmp.conf
 /usr/lib/tmpfiles.d/systemd-nologin.conf
 /usr/lib/tmpfiles.d/systemd.conf
@@ -1305,6 +1298,7 @@ fi
 %dir /etc/systemd/user
 %config(noreplace) /etc/systemd/logind.conf
 %config(noreplace) /etc/systemd/journald.conf
+%config(noreplace) /etc/systemd/coredump.conf
 %dir /etc/systemd/system
 %config(noreplace) /etc/systemd/system.conf
 %ghost %config(noreplace) /etc/X11/xorg.conf.d/00-keyboard.conf
@@ -1455,6 +1449,7 @@ fi
 %{_unitdir}/systemd-udev-trigger.service.d/systemd-udev-trigger-no-reload.conf
 %{_unitdir}/sockets.target.wants/systemd-udevd-control.socket
 %{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket
+%{_unitdir}/sockets.target.wants/systemd-coredump.socket
 %{_systemddir}/system-generators/systemd-cryptsetup-generator
 %{_systemddir}/system-generators/systemd-hibernate-resume-generator
 %{_systemddir}/system-generators/systemd-gpt-auto-generator
@@ -1677,16 +1672,6 @@ fi
 %files pam
 %{_libdir}/security/pam_systemd.so
 
-%files coredump
-%defattr(-,root,root)
-%{_bindir}/coredumpctl
-%{_prefix}/lib/systemd/systemd-coredump
-%{_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
-
 %files portable
 %defattr(-,root,root)
 %{_bindir}/portablectl
@@ -1712,8 +1697,11 @@ fi
 %{_unitdir}/systemd-userdbd.socket
 
 %changelog
-+* Tue Dec 27 2021 yangmingtai <yangmingtai@huawei.com> - 249-2
+* Tue Feb 8 2021 yangmingtai <yangmingtai@huawei.com> - 249-3
-+- delete useless Provides and Obsoletes
+- do not make systemd-cpredump sub packages
+
+* Tue Dec 27 2021 yangmingtai <yangmingtai@huawei.com> - 249-2
+- delete useless Provides and Obsoletes
 
 * Wed Dec 8 2021 yangmingtai <yangmingtai@huawei.com> - 249-1
 - systemd update to v249
@@ -1742,7 +1730,7 @@ fi
 * Mon Aug 16 2021 yangmingtai <yangmingtai@huawei.com> - 248-8
 - udev: exec daemon-reload after installation
 
-* Thu Jul 22 2021 yangmingtai <yangmingtai@huawei.com> - 248-7
+* Fri Jul 22 2021 yangmingtai <yangmingtai@huawei.com> - 248-7
 - fix CVE-2021-33910
 
 * Thu Jun 03 2021 shenyangyang <shenyangyang4@huawei.com> - 248-6