- partial update to 238; target-pld.patch hostname parsing needs testing; files secti...

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index 4e26c4eb479a5dc2018da954617220703949d76f..ea7785501acf2783e2c6eb043b9caab7d68f5a40 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -25,13 +25,13 @@ Summary:    A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:       235
-Release:       1
+Version:       238
+Release:       0.1
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 Source0:       https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: d53a925f1ca5b2e124de0a8aa65d0db2
+# Source0-md5: 76db8004647283b779234364cd637d3c
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -64,7 +64,7 @@ Patch3:               tmpfiles-not-fatal.patch
 Patch4:                udev-ploop-rules.patch
 Patch5:                udevadm-in-sbin.patch
 Patch6:                net-rename-revert.patch
-
+Patch7:                %{name}-glibc.patch
 Patch8:                proc-hidepid.patch
 Patch9:                %{name}-configfs.patch
 Patch10:       pld-boot_efi_mount.patch
@@ -115,7 +115,7 @@ BuildRequires:      pkgconfig >= 0.9.0
 BuildRequires: python3
 BuildRequires: python3-lxml
 %{?with_qrencode:BuildRequires:        qrencode-devel}
-BuildRequires: rpmbuild(macros) >= 1.727
+BuildRequires: rpmbuild(macros) >= 1.728
 BuildRequires: sed >= 4.0
 %{?with_tests:BuildRequires:   systemd}
 BuildRequires: usbutils >= 0.82
@@ -628,7 +628,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch5 -p1
 # rejected upstream (do not disable!)
 %patch6 -p1
-
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -655,6 +655,8 @@ cp -p %{SOURCE2} src/systemd_booted.c
        -Dlz4=true \
        -Dmicrohttpd=%{__true_false microhttpd} \
        -Dmount-path=/bin/mount \
+       -Dnobody-user="nobody" \
+       -Dnobody-group="nogroup" \
        -Dntp-servers='0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org' \
        -Dpam=%{__true_false pam} \
        -Dqrencode=%{__true_false qrencode} \
@@ -667,11 +669,13 @@ cp -p %{SOURCE2} src/systemd_booted.c
        -Drootsbindir=%{_rootsbindir} \
        -Dselinux=%{__true_false selinux} \
        -Dsetfont-path=/bin/setfont \
+       -Dsplit-bin=true \
        -Dsplit-usr=true \
        -Dsulogin-path=/sbin/sulogin \
        -Dsysvinit-path=/etc/rc.d/init.d \
        -Dsysvrcnd-path=/etc/rc.d \
-       -Dumount-path=/bin/umount
+       -Dumount-path=/bin/umount \
+       -Dusers-gid=1000 \
 
 %meson_build -C build
 
@@ -684,7 +688,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/lib/{%{name}/{catalog,coredump},machines} \
        $RPM_BUILD_ROOT{%{_sysconfdir}/{modprobe.d,systemd/system-preset},%{_rootsbindir}}
 install -d $RPM_BUILD_ROOT%{systemduserunitdir}/sockets.target.wants
-install -d $RPM_BUILD_ROOT%{systemdunitdir}/final.target.wants
+install -d $RPM_BUILD_ROOT%{systemdunitdir}/{final,sound,system-update}.target.wants
 
 %meson_install -C build
 
@@ -737,17 +741,6 @@ echo ".so man8/udevd.8" >$RPM_BUILD_ROOT%{_mandir}/man8/systemd-udevd.8
 # Main binary has been moved, but we don't want to break existing installs
 ln -s ../lib/systemd/systemd $RPM_BUILD_ROOT/bin/systemd
 
-# Create SysV compatibility symlinks. systemctl/systemd are smart
-# enough to detect the way they were called
-install -d $RPM_BUILD_ROOT/sbin
-ln -s ../lib/systemd/systemd $RPM_BUILD_ROOT/sbin/init
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/halt
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/poweroff
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/reboot
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/shutdown
-ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit
-
 ln -s ../modules $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/modules.conf
 
 # disable redundant SYSV services
@@ -1062,7 +1055,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc DISTRO_PORTING NEWS README TODO
+%doc doc/DISTRO_PORTING NEWS README TODO
 %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
@@ -1111,7 +1104,7 @@ fi
 %attr(755,root,root) /bin/systemd-notify
 %attr(755,root,root) /bin/systemd-sysusers
 %attr(755,root,root) /bin/systemd-tty-ask-password-agent
-%attr(755,root,root) %{_bindir}/bootctl
+%{?with_efi:%attr(755,root,root) %{_bindir}/bootctl}
 %attr(755,root,root) %{_bindir}/busctl
 %attr(755,root,root) %{_bindir}/coredumpctl
 %attr(755,root,root) %{_bindir}/hostnamectl
@@ -1222,6 +1215,7 @@ fi
 %lang(be) %{_libexecdir}/systemd/catalog/systemd.be.catalog
 %lang(be) %{_libexecdir}/systemd/catalog/systemd.be@latin.catalog
 %lang(bg) %{_libexecdir}/systemd/catalog/systemd.bg.catalog
+%lang(de) %{_libexecdir}/systemd/catalog/systemd.de.catalog
 %lang(fr) %{_libexecdir}/systemd/catalog/systemd.fr.catalog
 %lang(it) %{_libexecdir}/systemd/catalog/systemd.it.catalog
 %lang(pl) %{_libexecdir}/systemd/catalog/systemd.pl.catalog
@@ -1269,7 +1263,7 @@ fi
 %{_datadir}/factory/etc/nsswitch.conf
 %{_datadir}/factory/etc/pam.d/other
 %{_datadir}/factory/etc/pam.d/system-auth
-%{_mandir}/man1/bootctl.1*
+%{?with_efi:%{_mandir}/man1/bootctl.1*}
 %{_mandir}/man1/busctl.1*
 %{_mandir}/man1/coredumpctl.1*
 %{_mandir}/man1/hostnamectl.1*
@@ -1593,7 +1587,7 @@ fi
 %{systemdunitdir}/systemd-volatile-root.service
 %{systemdunitdir}/user@.service
 %{systemdunitdir}/machine.slice
-%{systemdunitdir}/system.slice
+#%{systemdunitdir}/system.slice
 %{systemdunitdir}/user.slice
 %exclude %{systemdunitdir}/rc-inetd.service
 %{systemdunitdir}/syslog.socket
@@ -1640,7 +1634,6 @@ fi
 %{systemdunitdir}/remote-fs-pre.target
 %{systemdunitdir}/remote-fs.target
 %if %{with cryptsetup}
-%{systemdunitdir}/remote-cryptsetup-pre.target
 %{systemdunitdir}/remote-cryptsetup.target
 %endif
 %{systemdunitdir}/rescue.target
@@ -1683,6 +1676,8 @@ fi
 %dir %{systemdunitdir}/rescue.target.wants
 %dir %{systemdunitdir}/runlevel[12345].target.wants
 %dir %{systemdunitdir}/shutdown.target.wants
+%dir %{systemdunitdir}/sound.target.wants
+%dir %{systemdunitdir}/system-update.target.wants
 %dir %{systemdunitdir}/sigpwr.target.wants
 %dir %{systemdunitdir}/sockets.target.wants
 %dir %{systemdunitdir}/sysinit.target.wants
@@ -1873,7 +1868,7 @@ fi
 
 %files -n bash-completion-systemd
 %defattr(644,root,root,755)
-%{bash_compdir}/bootctl
+%{?with_efi:%{bash_compdir}/bootctl}
 %{bash_compdir}/busctl
 %{bash_compdir}/coredumpctl
 %{bash_compdir}/hostnamectl
@@ -1898,7 +1893,7 @@ fi
 
 %files -n zsh-completion-systemd
 %defattr(644,root,root,755)
-%{zsh_compdir}/_bootctl
+%{?with_efi:%{zsh_compdir}/_bootctl}
 %{zsh_compdir}/_busctl
 %{zsh_compdir}/_coredumpctl
 %{zsh_compdir}/_hostnamectl