systemd.pc moved to devel subpackage to get rid of pkgconfig dependency from systemd...

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index 5f7a395737b71476f909c918bad8d3ddb2151cbe..b73f143f0187a7f300470fbc7468ffcb88e6c942 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -30,14 +30,14 @@ 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:       248.2
-Release:       0.1
+Version:       249.5
+Release:       1
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 #Source0Download: https://github.com/systemd/systemd/releases
 Source0:       https://github.com/systemd/systemd-stable/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a9ef37089c45cd9c80802c30152a7485
+# Source0-md5: bd8fccd7a5c5672fed1937f8fd228cba
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -69,14 +69,13 @@ Patch1:             config-pld.patch
 Patch2:                pld-sysv-network.patch
 Patch3:                tmpfiles-not-fatal.patch
 Patch4:                udev-ploop-rules.patch
-
+Patch5:                %{name}-split-usr-fix.patch
 Patch6:                net-rename-revert.patch
 Patch7:                %{name}-completion.patch
 Patch8:                proc-hidepid.patch
 Patch9:                %{name}-configfs.patch
 Patch10:       pld-boot_efi_mount.patch
 Patch11:       optional-tmp-on-tmpfs.patch
-Patch12:       uids_gids.patch
 Patch13:       sysctl.patch
 Patch14:       pld-pam-%{name}-user.patch
 Patch15:       %{name}-x32.patch
@@ -129,6 +128,7 @@ BuildRequires:      pcre2-8-devel
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: polkit-devel >= 0.106
 BuildRequires: python3
+BuildRequires: python3-jinja2
 BuildRequires: python3-lxml
 %{?with_qrencode:BuildRequires:        qrencode-devel >= 4}
 BuildRequires: rpmbuild(macros) >= 1.752
@@ -727,7 +727,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
+%patch5 -p1
 # rejected upstream (do not disable!)
 %patch6 -p1
 %patch7 -p1
@@ -735,7 +735,6 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
@@ -746,6 +745,27 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
 
 %build
 %meson build \
+       -Dadm-gid=3 \
+       -Daudio-gid=23 \
+       -Dcdrom-gid=27 \
+       -Ddialout-gid=16 \
+       -Ddisk-gid=6 \
+       -Dinput-gid=182 \
+       -Dkmem-gid=9 \
+       -Dkvm-gid=160 \
+       -Dlp-gid=7 \
+       -Dsgx-gid=344 \
+       -Dtape-gid=68 \
+       -Dusers-gid=1000 \
+       -Dutmp-gid=22 \
+       -Dvideo-gid=24 \
+       -Dwheel-gid=10 \
+       -Dsystemd-journal-gid=288 \
+       -Dsystemd-network-uid=316 \
+       -Dsystemd-resolve-uid=317 \
+       -Dsystemd-timesync-uid=318 \
+       -Dnobody-user="nobody" \
+       -Dnobody-group="nogroup" \
        -Daudit=%{__true_false audit} \
        -Ddefault-hierarchy=hybrid \
        -Ddefault-kill-user-processes=false \
@@ -761,8 +781,6 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
        -Dman=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} \
@@ -781,7 +799,6 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
        -Dsysvrcnd-path=/etc/rc.d \
        -Dtpm2=%{__true_false tpm2} \
        -Dumount-path=/bin/umount \
-       -Dusers-gid=1000 \
 
 %ninja_build -C build
 
@@ -1323,6 +1340,7 @@ fi
 %dir %{_prefix}/lib/systemd/boot/efi
 %ifarch %{ix86}
 %{_prefix}/lib/systemd/boot/efi/linuxia32.efi.stub
+%{_prefix}/lib/systemd/boot/efi/linuxia32.elf.stub
 %{_prefix}/lib/systemd/boot/efi/systemd-bootia32.efi
 %endif
 %ifarch %{x8664} x32
@@ -1431,6 +1449,7 @@ fi
 %{_mandir}/man5/coredump.conf.d.5*
 %{_mandir}/man5/dnssec-trust-anchors.d.5*
 %{_mandir}/man5/hostname.5*
+%{_mandir}/man5/initrd-release.5*
 %{_mandir}/man5/journald@.conf.5*
 %{?with_efi:%{_mandir}/man5/loader.conf.5*}
 %if %{with microhttpd}
@@ -1613,6 +1632,7 @@ fi
 %dir %{_sysconfdir}/systemd/system-preset
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system-preset/default.preset
 %dir %{_sysconfdir}/tmpfiles.d
+%dir %{_prefix}/lib/binfmt.d
 %dir %{_prefix}/lib/environment.d
 %dir %{_prefix}/lib/modules-load.d
 %dir %{_prefix}/lib/sysctl.d
@@ -1663,7 +1683,6 @@ fi
 %{_mandir}/man5/tmpfiles.d.5*
 %{_mandir}/man5/environment.d.5*
 %{_mandir}/man8/systemd-tmpfiles.8*
-%{_npkgconfigdir}/systemd.pc
 
 %{systemdunitdir}/dev-hugepages.mount
 %{systemdunitdir}/dev-mqueue.mount
@@ -1829,6 +1848,7 @@ fi
 %{systemdunitdir}/initrd-fs.target
 %{systemdunitdir}/initrd-root-fs.target
 %{systemdunitdir}/initrd-switch-root.target
+%{systemdunitdir}/initrd-usr-fs.target
 %{systemdunitdir}/initrd.target
 %{systemdunitdir}/kexec.target
 %{systemdunitdir}/local-fs-pre.target
@@ -2191,6 +2211,7 @@ fi
 %attr(755,root,root) /%{_lib}/libsystemd.so
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libsystemd.pc
+%{_npkgconfigdir}/systemd.pc
 %{_mandir}/man3/SD_*.3*
 %{_mandir}/man3/sd*.3*
 
@@ -2292,11 +2313,13 @@ fi
 /lib/udev/hwdb.d/60-evdev.hwdb
 /lib/udev/hwdb.d/60-input-id.hwdb
 /lib/udev/hwdb.d/60-keyboard.hwdb
+/lib/udev/hwdb.d/60-seat.hwdb
 /lib/udev/hwdb.d/60-sensor.hwdb
 /lib/udev/hwdb.d/70-joystick.hwdb
 /lib/udev/hwdb.d/70-mouse.hwdb
 /lib/udev/hwdb.d/70-pointingstick.hwdb
 /lib/udev/hwdb.d/70-touchpad.hwdb
+/lib/udev/hwdb.d/80-ieee1394-unit-function.hwdb
 
 %attr(755,root,root) %{_rootsbindir}/start_udev
 %attr(755,root,root) %{_rootsbindir}/udevd
@@ -2317,7 +2340,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-uinput.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-steam_controller.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-i2c.rules
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/80-net-setup-link.rules
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/80-net-setup-link.rules
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
 
@@ -2345,6 +2368,7 @@ fi
 /lib/udev/rules.d/78-sound-card.rules
 /lib/udev/rules.d/80-drivers.rules
 /lib/udev/rules.d/80-net-setup-link.rules
+/lib/udev/rules.d/81-net-dhcp.rules
 /lib/udev/rules.d/90-vconsole.rules
 
 %{_mandir}/man5/udev.conf.5*