pool/util-linux
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1069593 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1069593
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=266
This commit is contained in:
Dominique Leuenberger 2023-03-06 17:54:40 +00:00 committed by Git OBS Bridge
commit 19f2f432a0
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util-linux.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Mar 6 10:43:35 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix comments bleeding into rpm scriptlets. /sbin/ldconfig does
not take any parameters and thus we must not have content in the
script body. Use %dnl to properly mark the comments as 'rpm
comments' (boo#1208963).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 27 09:01:54 UTC 2023 - pgajdos@suse.com Mon Feb 27 09:01:54 UTC 2023 - pgajdos@suse.com

36
util-linux.spec
View File

@ -698,14 +698,14 @@ exit "$result"
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
%verify_permissions -e %{_bindir}/su %verify_permissions -e %{_bindir}/su
%endif %endif
# ulsubset == core, ulbuild == base %dnl # ulsubset == core, ulbuild == base
%endif %endif
# ulbuild == base %dnl # ulbuild == base
################### %dnl ###################
# Core pre & post # %dnl # Core pre & post #
################### %dnl ###################
%if "%ulsubset" == "core" %if "%ulsubset" == "core"
%pre %pre
# move outdated pam.d/*.rpmsave files away # move outdated pam.d/*.rpmsave files away
@ -742,7 +742,7 @@ if ! grep -q "^# /etc/default/su is an override" %{_sysconfdir}/default/su ; the
fi fi
fi fi
%endif %endif
# !defined no_config %dnl # !defined no_config
%if %{defined no_config} %if %{defined no_config}
%posttrans %posttrans
@ -751,7 +751,7 @@ for i in login remote runuser runuser-l su su-l; do
test -f /etc/pam.d/${i}.rpmsave && mv -v /etc/pam.d/${i}.rpmsave /etc/pam.d/${i} ||: test -f /etc/pam.d/${i}.rpmsave && mv -v /etc/pam.d/${i}.rpmsave /etc/pam.d/${i} ||:
done done
%endif %endif
# defined no_config %dnl # defined no_config
%post -n libblkid1 -p /sbin/ldconfig %post -n libblkid1 -p /sbin/ldconfig
@ -774,11 +774,11 @@ done
%postun -n libfdisk1 -p /sbin/ldconfig %postun -n libfdisk1 -p /sbin/ldconfig
%endif %endif
# ulsubset == core, pre & post %dnl # ulsubset == core, pre & post
%dnl
###################### %dnl ######################
# Systemd pre & post # %dnl # Systemd pre & post #
###################### %dnl ######################
%if "%ulsubset" == "systemd" %if "%ulsubset" == "systemd"
%pre %pre
%service_add_pre fstrim.service fstrim.timer %service_add_pre fstrim.service fstrim.timer
@ -800,7 +800,7 @@ getent passwd uuidd >/dev/null || \
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
-d %{_localstatedir}/run/uuidd uuidd -d %{_localstatedir}/run/uuidd uuidd
%endif %endif
# suse_version < 1330 %dnl # suse_version < 1330
%{service_add_pre uuidd.socket uuidd.service} %{service_add_pre uuidd.socket uuidd.service}
@ -819,11 +819,11 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{service_del_postun uuidd.socket uuidd.service} %{service_del_postun uuidd.socket uuidd.service}
%endif %endif
# ulsubset == systemd, pre & post %dnl # ulsubset == systemd, pre & post
%dnl
############## %dnl ##############
# Base files # %dnl # Base files #
############## %dnl ##############
%if "%ulbuild" == "base" %if "%ulbuild" == "base"
%files -n %{name} -f %{name}.files %files -n %{name} -f %{name}.files
%defattr(-,root,root) %defattr(-,root,root)