rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

- When systemd-container is installed install tar/gpg too

Browse Source 
So `machinectl import-tar` always works flawlessly. systemd-container already
  is an optional package and both tar and gpg are rather basic anyway so no harm
  should be done by requiring them.
- Move the systemd sysupdate stuff from the main package to the experimental
  sub-package while it's still time. The method used (currently) for updating
  openSUSE distro is rpm, not systemd-sysupdate.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1295
This commit is contained in:
Franck Bui 2022-07-18 16:35:38 +00:00 committed by Git OBS Bridge
parent 49cdefb529
commit de7f0bab9e
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
files.experimental
View File

@ -19,11 +19,17 @@
%{_mandir}/man5/homed.conf.d.5.gz
%{_mandir}/man5/org.freedesktop.home1.5.gz
%{_mandir}/man5/repart.d.5.gz
%{_mandir}/man5/sysupdate.d.5.gz
%{_mandir}/man8/pam_systemd_home.8.gz
%{_mandir}/man8/systemd-homed.8.gz
%{_mandir}/man8/systemd-homed.service.8.gz
%{_mandir}/man8/systemd-repart.8.gz
%{_mandir}/man8/systemd-repart.service.8.gz
%{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz
%{_mandir}/man8/systemd-sysupdate-reboot.timer.8.gz
%{_mandir}/man8/systemd-sysupdate.8.gz
%{_mandir}/man8/systemd-sysupdate.service.8.gz
%{_mandir}/man8/systemd-sysupdate.timer.8.gz
%{_mandir}/man8/systemd-userdbd.8.gz
%{_mandir}/man8/systemd-userdbd.service.8.gz
%{_pam_moduledir}/pam_systemd_home.so
@ -31,10 +37,15 @@
%{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service
%{_systemd_util_dir}/systemd-homed
%{_systemd_util_dir}/systemd-homework
%{_systemd_util_dir}/systemd-sysupdate
%{_systemd_util_dir}/systemd-userdbd
%{_systemd_util_dir}/systemd-userwork
%{_unitdir}/systemd-homed-activate.service
%{_unitdir}/systemd-homed.service
%{_unitdir}/systemd-repart.service
%{_unitdir}/systemd-sysupdate-reboot.service
%{_unitdir}/systemd-sysupdate-reboot.timer
%{_unitdir}/systemd-sysupdate.service
%{_unitdir}/systemd-sysupdate.timer
%{_unitdir}/systemd-userdbd.service
%{_unitdir}/systemd-userdbd.socket

15
files.systemd
View File

@ -302,7 +302,6 @@
%{_mandir}/man5/systemd.target.5.gz
%{_mandir}/man5/systemd.timer.5.gz
%{_mandir}/man5/systemd.unit.5.gz
%{_mandir}/man5/sysupdate.d.5.gz
%{_mandir}/man5/sysusers.d.5.gz
%{_mandir}/man5/timesyncd.conf.5.gz
%{_mandir}/man5/timesyncd.conf.d.5.gz
@ -388,11 +387,6 @@
%{_mandir}/man8/systemd-sysext.8.gz
%{_mandir}/man8/systemd-sysext.service.8.gz
%{_mandir}/man8/systemd-system-update-generator.8.gz
%{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz
%{_mandir}/man8/systemd-sysupdate-reboot.timer.8.gz
%{_mandir}/man8/systemd-sysupdate.8.gz
%{_mandir}/man8/systemd-sysupdate.service.8.gz
%{_mandir}/man8/systemd-sysupdate.timer.8.gz
%{_mandir}/man8/systemd-sysusers.8.gz
%{_mandir}/man8/systemd-sysusers.service.8.gz
%{_mandir}/man8/systemd-time-wait-sync.8.gz
@ -452,9 +446,6 @@
%{_systemd_util_dir}/systemd-socket-proxyd
%{_systemd_util_dir}/systemd-sulogin-shell
%{_systemd_util_dir}/systemd-sysctl
%if %{without bootstrap}
%{_systemd_util_dir}/systemd-sysupdate
%endif
%{_systemd_util_dir}/systemd-time-wait-sync
%{_systemd_util_dir}/systemd-timedated
%{_systemd_util_dir}/systemd-timesyncd
@ -649,12 +640,6 @@
%{_unitdir}/systemd-suspend.service
%{_unitdir}/systemd-sysctl.service
%{_unitdir}/systemd-sysext.service
%if %{without bootstrap}
%{_unitdir}/systemd-sysupdate-reboot.service
%{_unitdir}/systemd-sysupdate-reboot.timer
%{_unitdir}/systemd-sysupdate.service
%{_unitdir}/systemd-sysupdate.timer
%endif
%{_unitdir}/systemd-sysusers.service
%{_unitdir}/systemd-time-wait-sync.service
%{_unitdir}/systemd-timedated.service

13
systemd.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Jul 18 15:54:51 UTC 2022 - Franck Bui <fbui@suse.com>
- When systemd-container is installed install tar/gpg too
So `machinectl import-tar` always works flawlessly. systemd-container already
is an optional package and both tar and gpg are rather basic anyway so no harm
should be done by requiring them.
- Move the systemd sysupdate stuff from the main package to the experimental
sub-package while it's still time. The method used (currently) for updating
openSUSE distro is rpm, not systemd-sysupdate.
-------------------------------------------------------------------
Tue Jul 12 14:41:48 UTC 2022 - Franck Bui <fbui@suse.com>

5
systemd.spec
View File

@ -388,6 +388,9 @@ BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(zlib)
%endif
Requires: %{name} = %{version}-%{release}
# import-tar needs tar and gpg
Requires: /usr/bin/tar
Requires: /usr/bin/gpg
%systemd_requires
Obsoletes: nss-mymachines < %{version}-%{release}
Provides: nss-mymachines = %{version}-%{release}
@ -693,7 +696,6 @@ Have fun with these services at your own risk.
-Dnss-systemd=%{when_not bootstrap} \
-Dseccomp=%{when_not bootstrap} \
-Dselinux=%{when_not bootstrap} \
-Dsysupdate=%{when_not bootstrap} \
-Dtpm=%{when_not bootstrap} \
-Dtpm2=%{when_not bootstrap} \
-Dtranslations=%{when_not bootstrap} \
@ -722,6 +724,7 @@ Have fun with these services at your own risk.
\
-Dhomed=%{when experimental} \
-Drepart=%{when experimental} \
-Dsysupdate=%{when experimental} \
-Duserdb=%{when experimental} \
\
-Dtests=%{when testsuite unsafe} \