diff --git a/systemd.spec b/systemd.spec index 9fe19d2..2205732 100644 --- a/systemd.spec +++ b/systemd.spec @@ -26,7 +26,7 @@ Name: systemd Epoch: 2 -Version: 249 +Version: 250 Release: 2mamba Summary: A system and service manager compatible with SysV and LSB init scripts Group: System/Configuration @@ -71,6 +71,8 @@ Patch20: systemd-240-upstream_fix_return_values.patch Patch21: systemd-247-upstream-fixes-1.patch License: GPL ## AUTOBUILDREQ-BEGIN +#ld-linux.so.2(GLIBC_2.3): .so link not found +#ld-linux.so.2: .so link not found BuildRequires: glibc-devel BuildRequires: iptables-devel BuildRequires: libacl-devel @@ -80,8 +82,6 @@ BuildRequires: libbzip2-devel BuildRequires: libcap-devel BuildRequires: libcryptsetup-devel BuildRequires: libcurl-devel -BuildRequires: libdw-devel -BuildRequires: libelf-devel BuildRequires: libfdisk-devel BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel @@ -107,6 +107,7 @@ BuildRequires: iptables-devel >= 1.8.3 BuildRequires: docbook-xsl >= 1.79.2-3mamba Conflicts: sysvinit Conflicts: initscripts-sysv5 +Requires: libkmod >= 29-2mamba Requires: sysvinit-tools Requires: kbd Requires: dbus >= 1.13.2 @@ -226,7 +227,7 @@ export LC_ALL="en_US.UTF-8" --infodir=%{_datadir}/info \ -Dc_std=gnu11 \ -Drootlibdir=%{_libdir} \ - -Dpamlibdir=/%{_lib}/security \ + -Dpamlibdir=%{_libdir}/security \ -Dtty-gid=4 \ -Dman=true \ -Dusers-gid=100 \ @@ -662,8 +663,8 @@ systemctl daemon-reload &>/dev/null || : %exclude %{_datadir}/bash-completion/completions/udevadm %dir %{_prefix}/lib/kernel %dir %{_prefix}/lib/kernel/install.d -%{_prefix}/lib/kernel/install.d/50-depmod.install -%{_prefix}/lib/kernel/install.d/90-loaderentry.install +%{_prefix}/lib/kernel/install.d/*.install +%{_prefix}/lib/kernel/install.conf %dir %{_prefix}/lib/binfmt.d %dir %{_prefix}/lib/modules-load.d %dir %{_prefix}/lib/repart.d @@ -674,19 +675,21 @@ systemctl daemon-reload &>/dev/null || : %{_prefix}/lib/tmpfiles.d/README %dir %{_prefix}/lib/systemd %{_prefix}/lib/systemd/* +%{_prefix}/lib/systemd/libsystemd-shared-*.so %dir %{_prefix}/lib/sysusers.d %{_prefix}/lib/sysusers.d/README %{_prefix}/lib/sysusers.d/*.conf -#%dir /lib/systemd -#/lib/systemd/* -%exclude /lib/systemd/systemd-udevd +%exclude %{_prefix}/lib/systemd/systemd-udevd %{_prefix}/lib/udev/rules.d/99-systemd.rules -%{_prefix}/lib/kernel/install.d/00-entry-directory.install %{_prefix}/lib/environment.d/99-environment.conf %dir %{_prefix}/lib/modprobe.d %{_prefix}/lib/modprobe.d/systemd.conf %{_prefix}/lib/modprobe.d/README %{_prefix}/lib/tmpfiles.d/*.conf +# NOTE: requires libsystemd-shared-*.so so can't be in libsystemd for biarch support +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +%{_datadir}/dbus-1/interfaces/org.freedesktop.*.xml %{_datadir}/dbus-1/system.d/org.freedesktop.*.conf %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.*.service @@ -708,7 +711,6 @@ systemctl daemon-reload &>/dev/null || : %{_datadir}/zsh/site-functions/* %{_datadir}/polkit-1/actions/org.freedesktop.*.policy %{_datadir}/polkit-1/rules.d/systemd-networkd.rules -%{_localstatedir}/log/README %dir %{_localstatedir}/log/journal %dir %{_localstatedir}/log/journal/remote %dir %{_localstatedir}/lib/systemd @@ -753,14 +755,15 @@ systemctl daemon-reload &>/dev/null || : %{_mandir}/man8/shutdown.8* %{_mandir}/man8/systemd-*.8* %{_mandir}/man8/telinit.8* +%doc LICENSE.GPL2 %files -n libsystemd %defattr(-,root,root) %{_libdir}/libsystemd.so.* -/%{_lib}/security/pam_systemd.* -/%{_lib}/security/pam_systemd_home.so +%{_libdir}/security/pam_systemd.* +%{_libdir}/security/pam_systemd_home.so %{_libdir}/libnss_*.so.* -#%doc LICENSE.LGPL2.1 +%doc LICENSE.LGPL2.1 %files -n libsystemd-devel %defattr(-,root,root) @@ -804,11 +807,12 @@ systemctl daemon-reload &>/dev/null || : %{_prefix}/lib/udev/v4l_id %{_datadir}/pkgconfig/udev.pc %{_mandir}/man8/udevadm.8* -#%doc LICENSE.GPL2 +%doc LICENSE.GPL2 %files -n libudev %defattr(-,root,root) %{_libdir}/libudev.so.* +%doc LICENSE.LGPL2.1 %files -n libudev-devel %defattr(-,root,root) @@ -817,6 +821,12 @@ systemctl daemon-reload &>/dev/null || : %{_libdir}/pkgconfig/libudev.pc %changelog +* Mon Dec 27 2021 Silvan Calarco 250-2mamba +- move cryptsetup from libsystemd to systemd for biarch support + +* Sun Dec 26 2021 Automatic Build System 250-1mamba +- automatic version update by autodist + * Tue Aug 17 2021 Silvan Calarco 249-2mamba - recreate /lib/systemd as symlink if it has been deleted by a previous upgrade