From d25c431e40ad0066c991324a72b9286388db3cff84e452c0d8523f8618feac48 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 6 Mar 2023 10:50:16 +0000
Subject: [PATCH 1/2] Accepting request 1069590 from home:dimstar:Factory

- 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).

OBS-URL: https://build.opensuse.org/request/show/1069590
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=498
---
 util-linux.changes |  8 ++++++++
 util-linux.spec    | 26 +++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/util-linux.changes b/util-linux.changes
index 62e6c86..6b73a72 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -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
 
diff --git a/util-linux.spec b/util-linux.spec
index ecbfcdb..2b7c589 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -742,7 +742,7 @@ if ! grep -q "^# /etc/default/su is an override" %{_sysconfdir}/default/su ; the
 	fi
 fi
 %endif
-# !defined no_config
+%dnl # !defined no_config
 
 %if %{defined no_config}
 %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} ||:
 done
 %endif
-# defined no_config
+%dnl # defined no_config
 
 %post -n libblkid1 -p /sbin/ldconfig
 
@@ -774,11 +774,11 @@ done
 %postun -n libfdisk1 -p /sbin/ldconfig
 
 %endif
-# ulsubset == core, pre & post
-
-######################
-# Systemd pre & post #
-######################
+%dnl # ulsubset == core, pre & post
+%dnl
+%dnl ######################
+%dnl # Systemd pre & post #
+%dnl ######################
 %if "%ulsubset" == "systemd"
 %pre
 %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" \
 	-d %{_localstatedir}/run/uuidd uuidd
 %endif
-# suse_version < 1330
+%dnl # suse_version < 1330
 
 %{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}
 
 %endif
-# ulsubset == systemd, pre & post
-
-##############
-# Base files #
-##############
+%dnl # ulsubset == systemd, pre & post
+%dnl
+%dnl ##############
+%dnl # Base files #
+%dnl ##############
 %if "%ulbuild" == "base"
 %files -n %{name} -f %{name}.files
 %defattr(-,root,root)

From c11a03c27567a7e7d304461558246ba51e1d20bc6b52a5acf822ae40bcdac3dc Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 6 Mar 2023 10:57:30 +0000
Subject: [PATCH 2/2] Accepting request 1069592 from home:dimstar:Factory

Somem ore cleanup of the same style; bleeds in to a script, but does not cause harm there

OBS-URL: https://build.opensuse.org/request/show/1069592
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=499
---
 util-linux.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/util-linux.spec b/util-linux.spec
index 2b7c589..6afd9ba 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -698,14 +698,14 @@ exit "$result"
 %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
 %verify_permissions -e %{_bindir}/su
 %endif
-# ulsubset == core, ulbuild == base
+%dnl # ulsubset == core, ulbuild == base
 
 %endif
-# ulbuild == base
+%dnl # ulbuild == base
 
-###################
-# Core pre & post #
-###################
+%dnl ###################
+%dnl # Core pre & post #
+%dnl ###################
 %if "%ulsubset" == "core"
 %pre
 # move outdated pam.d/*.rpmsave files away