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

Accepting request 933656 from home:lnussel:branches:Base:System

Browse Source 
- Replace S:$n references with SOURCE$n. Makes vim * search work.

OBS-URL: https://build.opensuse.org/request/show/933656
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1215
This commit is contained in:
Franck Bui 2021-11-25 10:00:18 +00:00 committed by Git OBS Bridge
parent ffad028ee5
commit 3fdff99e48
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
systemd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 24 10:40:01 UTC 2021 - Ludwig Nussel <lnussel@suse.com>
- Replace S:$n references with SOURCE$n. Makes vim * search work.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 22 08:48:12 UTC 2021 - Franck Bui <fbui@suse.com> Mon Nov 22 08:48:12 UTC 2021 - Franck Bui <fbui@suse.com>

14
systemd.spec
View File

@ -725,8 +725,8 @@ rm %{buildroot}%{_mandir}/man1/resolvconf.1*
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated
install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert install -m0755 -D %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert
install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install install -m0755 -D %{SOURCE4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install
%endif %endif
mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network
@ -735,7 +735,7 @@ mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn
# Package the scripts used to fix all packaging issues. Also drop the # Package the scripts used to fix all packaging issues. Also drop the
# "scripts-{systemd/udev}" prefix which is used because osc doesn't # "scripts-{systemd/udev}" prefix which is used because osc doesn't
# allow directory structure... # allow directory structure...
for s in %{S:100} %{S:101} %{S:102}; do for s in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do
install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-}
done done
@ -759,7 +759,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants}
rm -f %{buildroot}/etc/systemd/system/default.target rm -f %{buildroot}/etc/systemd/system/default.target
# Replace upstream systemd-user with the openSUSE one. # Replace upstream systemd-user with the openSUSE one.
install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{S:2} install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2}
# don't enable wall ask password service, it spams every console (bnc#747783) # don't enable wall ask password service, it spams every console (bnc#747783)
rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path
@ -824,7 +824,7 @@ mkdir -p %{buildroot}%{_systemd_system_env_generator_dir}
mkdir -p %{buildroot}%{_systemd_user_env_generator_dir} mkdir -p %{buildroot}%{_systemd_user_env_generator_dir}
# ensure after.local wrapper is called # ensure after.local wrapper is called
install -m 644 %{S:11} %{buildroot}%{_unitdir}/ install -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/
ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/ ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/
# ghost directories with default permissions. # ghost directories with default permissions.
@ -867,7 +867,7 @@ echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset
# still keep the remaining paths that still don't have a better home # still keep the remaining paths that still don't have a better home
# in suse.conf. # in suse.conf.
rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf
install -m 644 %{S:5} %{buildroot}%{_tmpfilesdir}/suse.conf install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/suse.conf
# The content of the files shipped by systemd doesn't match the # The content of the files shipped by systemd doesn't match the
# defaults used by SUSE. Don't ship those files but leave the decision # defaults used by SUSE. Don't ship those files but leave the decision
@ -891,7 +891,7 @@ fi
# kbd-model-map.legacy is used to provide mapping for legacy keymaps, # kbd-model-map.legacy is used to provide mapping for legacy keymaps,
# which may still be used by yast. # which may still be used by yast.
cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
# Don't ship systemd-journald-audit.socket as there's no other way for # Don't ship systemd-journald-audit.socket as there's no other way for
# us to prevent journald from recording audit messages in the journal # us to prevent journald from recording audit messages in the journal