Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package util-linux for openSUSE:Factory
checked in at 2021-02-08 11:47:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/util-linux (Old)
and /work/SRC/openSUSE:Factory/.util-linux.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux"
Mon Feb 8 11:47:08 2021 rev:246 rq:869201 version:2.36.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/util-linux/python3-libmount.changes
2021-02-02 14:24:28.443280057 +0100
+++ /work/SRC/openSUSE:Factory/.util-linux.new.28504/python3-libmount.changes
2021-02-08 11:47:11.201686597 +0100
@@ -1,0 +2,53 @@
+Thu Feb 4 02:17:39 UTC 2021 - Stanislav Brabec <sbra...@suse.com>
+
+- Merge package with SLE15 SP3 and openSUSE Leap 15.3:
+ Obsoletes upstreamed patches:
+- libblkid: Do not trigger CDROM autoclose (v2.35, bsc#1084671,
+ util-linux-libblkid-cdrom-autoclose-1.patch,
+ util-linux-libblkid-cdrom-autoclose-2.patch,
+ util-linux-libblkid-cdrom-autoclose-3.patch).
+- lscpu: avoid segfault on PowerPC systems with valid hardware
+ configurations
+ (v2.36.1, bsc#1175623, bsc#1178554, bsc#1178825,
+ lscpu-avoid-segfault-on-PowerPC-systems-with-valid-h.patch)
+- Fix for SG#57988, bsc#1174942 (v2.36):
+ libmount-fix-mount-a-EBUSY-for-cifs.patch: Fix warning on mounts
+ to CIFS with mount ???a.
+- blockdev: Do not fail --report on kpartx-style partitions on
+ multipath (v2.36,
+ bsc#1168235, util-linux-blockdev-report-dm.patch).
+- nologin: Add support for -c to prevent error from su -c
+ (v2.35, bsc#1151708, util-linux-nologin-su-c.patch).
+- Add libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch:
+ Avoid triggering autofs in lookup_umount_fs_by_statfs
+ (v2.36 boo#1168389)
+- mount: fall back to device node name if /dev/mapper link not found
+ (v2.34, bsc#1149911)
+ * Add patch: util-linux-canonicalize-coverity-scan.patch
+- De-duplicate fstrim -A properly (v2.34, bsc#1127701,
+ util-linux-fstrim-A-1.patch, util-linux-fstrim-A-3.patch,
+ util-linux-fstrim-A-4.patch).
+- Do not trim read-only volumes
+ (v2.34, boo#1106214, util-linux-fstrim-A-2.patch,
+ util-linux-fstrim-A-4.patch).
+- libmount: To prevent incorrect behavior, recognize more pseudofs
+ and netfs (v2.34, bsc#1122417,
+ util-linux-libmount-pseudofs.patch).
+- agetty: Return previous response of agetty for special characters
+ (v2.34, bsc#1085196, bsc#1125886,
+ util-linux-agetty-smart-reload-13.patch,
+ util-linux-agetty-smart-reload-14.patch).
+- Fix problems in reading of login.defs values (v2.34, bsc#1121197,
+ util-linux-login_defs-priority1.patch,
+ util-linux-login_defs-priority2.patch,
+ util-linux-login_defs-SYS_UID.patch).
+
+-------------------------------------------------------------------
+Thu Feb 4 01:24:55 UTC 2021 - Stanislav Brabec <sbra...@suse.com>
+
+- Build with libudev support to support non-root users
+ (boo#1169006).
+- Move findmnt and lsblk to util-linux-systemd, as they use libudev
+ (bsc#1169006#c10).
+
+-------------------------------------------------------------------
util-linux-systemd.changes: same change
util-linux.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-libmount.spec ++++++
--- /var/tmp/diff_new_pack.8XOXCL/_old 2021-02-08 11:47:12.989689496 +0100
+++ /var/tmp/diff_new_pack.8XOXCL/_new 2021-02-08 11:47:12.993689503 +0100
@@ -105,6 +105,7 @@
BuildRequires: librtas-devel
%endif
%if %build_util_linux_systemd
+BuildRequires: libudev-devel
BuildRequires: socat
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd)
@@ -201,8 +202,8 @@
Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/bin/logger
-# Service files are being migrated during the update from SLE < 12 and
openSUSE <= 13.1
-Conflicts: util-linux < 2.25
+# findmnt and lsblk are being migrated during the update from SLE < 12SP3 and
openSUSE < Leap 15.3
+Conflicts: util-linux < 2.36.1
%systemd_requires
%else
# ERROR: No build_* variables are set.
@@ -423,8 +424,8 @@
# sources to prevent building of systemd-less versions.
#
# WARNING: Never edit following line without doing all suggested in the echo
below!
-UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/logger.c
./misc-utils/uuidd.c '
-UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIBSYSTEMD' . | fgrep '.c' |
LC_ALL=C sort | tr '\n' ' ')
+UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/findmnt.c
./misc-utils/logger.c ./misc-utils/lsblk-properties.c ./misc-utils/uuidd.c '
+UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIB\(SYSTEMD\|UDEV\)' . | fgrep
'.c' | LC_ALL=C sort | tr '\n' ' ')
if test "$UTIL_LINUX_KNOWN_SYSTEMD_DEPS" != "$UTIL_LINUX_FOUND_SYSTEMD_DEPS" ;
then
echo "List of utilities depending on systemd have changed.
Please check the new util-linux-systemd file list, file removal and update of
Conflicts for safe update!
@@ -434,6 +435,13 @@
exit 1
fi
#END SYSTEMD SAFETY CHECK
+#BEGIN FIRST STAGE MODIFICATIONS
+%if ! %build_util_linux_systemd
+sed -i 's/if BUILD_FINDMNT/if FALSE/
+ s/if BUILD_LSBLK/if FALSE/
+ ' misc-utils/Makemodule.am
+%endif
+#END FIRST STAGE MODIFICATIONS
%else
#BEGIN SECOND STAGE MODIFICATIONS
# delete all make modules except wanted ones
@@ -444,7 +452,7 @@
%if %build_util_linux_systemd
# for lslogins
/login-utils/b 1
-# for logger and uuidd
+# for findmnt, logger, lsblk and uuidd
/misc-utils/b 1
# for fstrim.service and fstrim.timer
/sys-utils/b 1
@@ -474,8 +482,10 @@
# disable all make modules except wanted ones
sed -i '/^if BUILD_/{
%if %build_util_linux_systemd
- /LSLOGINS/b 1
+ /FINDMNT/b 1
/LOGGER/b 1
+ /LSBLK/b 1
+ /LSLOGINS/b 1
/UUIDD/b 1
/BASH_COMPLETION/b 1
%endif
@@ -646,8 +656,6 @@
ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin
ln -s %{_bindir}/umount %{buildroot}/bin
-ln -s %{_bindir}/findmnt %{buildroot}/bin
-ln -s %{_bindir}/lsblk %{buildroot}/bin
ln -s %{_sbindir}/agetty %{buildroot}/sbin
ln -s %{_sbindir}/blockdev %{buildroot}/sbin
ln -s %{_sbindir}/cfdisk %{buildroot}/sbin
@@ -742,7 +750,9 @@
mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid
mkdir -p %{buildroot}/run/uuidd
%if !0%{?usrmerged}
+ln -s %{_bindir}/findmnt %{buildroot}/bin
ln -s %{_bindir}/logger %{buildroot}/bin
+ln -s %{_bindir}/lsblk %{buildroot}/bin
%endif
# clock.txt from uuidd is a ghost file
touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt
@@ -751,6 +761,9 @@
%if !%build_util_linux
%make_install
%endif
+%else
+rm -f %{buildroot}%{_mandir}/man8/findmnt.8*
+rm -f %{buildroot}%{_mandir}/man8/lsblk.8*
%endif
# link duplicate manpages and python bindings
%fdupes -s %{buildroot}%{_prefix}
@@ -929,9 +942,7 @@
/bin/more
/bin/mount
/bin/umount
-/bin/findmnt
/bin/login
-/bin/lsblk
/sbin/agetty
/sbin/blockdev
/sbin/ctrlaltdel
@@ -972,7 +983,6 @@
%{_bindir}/dmesg
%{_bindir}/fallocate
%{_bindir}/fincore
-%{_bindir}/findmnt
%{_bindir}/flock
%{_bindir}/getopt
%{_bindir}/hardlink
@@ -992,7 +1002,6 @@
%if 0%{?usrmerged}
%{_bindir}/login
%endif
-%{_bindir}/lsblk
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lsirq
@@ -1159,7 +1168,6 @@
%{_mandir}/man8/mkswap.8.gz
%{_mandir}/man8/mount.8.gz
%{_mandir}/man8/nologin.8.gz
-%{_mandir}/man8/findmnt.8.gz
%{_mandir}/man8/fsfreeze.8.gz
%{_mandir}/man8/swaplabel.8.gz
%{_mandir}/man8/readprofile.8.gz
@@ -1177,7 +1185,6 @@
%{_mandir}/man8/wipefs.8.gz
%{_mandir}/man8/zramctl.8.gz
%{_mandir}/man8/fstrim.8.gz
-%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz
%{_mandir}/man8/sulogin.8.gz
%{_mandir}/man8/wdctl.8.gz
@@ -1192,7 +1199,9 @@
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/*
%if %build_util_linux_systemd
+%exclude %{_datadir}/bash-completion/completions/findmnt
%exclude %{_datadir}/bash-completion/completions/logger
+%exclude %{_datadir}/bash-completion/completions/lsblk
%exclude %{_datadir}/bash-completion/completions/lslogins
%exclude %{_datadir}/bash-completion/completions/uuidd
%endif
@@ -1319,9 +1328,13 @@
%endif
%defattr(-, root, root)
%if !0%{?usrmerged}
+/bin/findmnt
/bin/logger
+/bin/lsblk
%endif
+%{_bindir}/findmnt
%{_bindir}/logger
+%{_bindir}/lsblk
%{_bindir}/lslogins
#BEGIN bootstrap_hack
%if 0%{?suse_version} < 1330
@@ -1332,10 +1345,14 @@
%dir %{_datadir}/bash-completion/completions
%endif
#END bootstrap_hack
+%{_datadir}/bash-completion/completions/findmnt
%{_datadir}/bash-completion/completions/logger
+%{_datadir}/bash-completion/completions/lsblk
%{_datadir}/bash-completion/completions/lslogins
%{_mandir}/man1/logger.1.gz
%{_mandir}/man1/lslogins.1.gz
+%{_mandir}/man8/lsblk.8.gz
+%{_mandir}/man8/findmnt.8.gz
%{_sbindir}/rcfstrim
%{_unitdir}/fstrim.service
%{_unitdir}/fstrim.timer
++++++ util-linux-systemd.spec ++++++
--- /var/tmp/diff_new_pack.8XOXCL/_old 2021-02-08 11:47:13.033689568 +0100
+++ /var/tmp/diff_new_pack.8XOXCL/_new 2021-02-08 11:47:13.037689574 +0100
@@ -105,6 +105,7 @@
BuildRequires: librtas-devel
%endif
%if %build_util_linux_systemd
+BuildRequires: libudev-devel
BuildRequires: socat
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd)
@@ -201,8 +202,8 @@
Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/bin/logger
-# Service files are being migrated during the update from SLE < 12 and
openSUSE <= 13.1
-Conflicts: util-linux < 2.25
+# findmnt and lsblk are being migrated during the update from SLE < 12SP3 and
openSUSE < Leap 15.3
+Conflicts: util-linux < 2.36.1
%systemd_requires
%else
# ERROR: No build_* variables are set.
@@ -423,8 +424,8 @@
# sources to prevent building of systemd-less versions.
#
# WARNING: Never edit following line without doing all suggested in the echo
below!
-UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/logger.c
./misc-utils/uuidd.c '
-UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIBSYSTEMD' . | fgrep '.c' |
LC_ALL=C sort | tr '\n' ' ')
+UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/findmnt.c
./misc-utils/logger.c ./misc-utils/lsblk-properties.c ./misc-utils/uuidd.c '
+UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIB\(SYSTEMD\|UDEV\)' . | fgrep
'.c' | LC_ALL=C sort | tr '\n' ' ')
if test "$UTIL_LINUX_KNOWN_SYSTEMD_DEPS" != "$UTIL_LINUX_FOUND_SYSTEMD_DEPS" ;
then
echo "List of utilities depending on systemd have changed.
Please check the new util-linux-systemd file list, file removal and update of
Conflicts for safe update!
@@ -434,6 +435,13 @@
exit 1
fi
#END SYSTEMD SAFETY CHECK
+#BEGIN FIRST STAGE MODIFICATIONS
+%if ! %build_util_linux_systemd
+sed -i 's/if BUILD_FINDMNT/if FALSE/
+ s/if BUILD_LSBLK/if FALSE/
+ ' misc-utils/Makemodule.am
+%endif
+#END FIRST STAGE MODIFICATIONS
%else
#BEGIN SECOND STAGE MODIFICATIONS
# delete all make modules except wanted ones
@@ -444,7 +452,7 @@
%if %build_util_linux_systemd
# for lslogins
/login-utils/b 1
-# for logger and uuidd
+# for findmnt, logger, lsblk and uuidd
/misc-utils/b 1
# for fstrim.service and fstrim.timer
/sys-utils/b 1
@@ -474,8 +482,10 @@
# disable all make modules except wanted ones
sed -i '/^if BUILD_/{
%if %build_util_linux_systemd
- /LSLOGINS/b 1
+ /FINDMNT/b 1
/LOGGER/b 1
+ /LSBLK/b 1
+ /LSLOGINS/b 1
/UUIDD/b 1
/BASH_COMPLETION/b 1
%endif
@@ -646,8 +656,6 @@
ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin
ln -s %{_bindir}/umount %{buildroot}/bin
-ln -s %{_bindir}/findmnt %{buildroot}/bin
-ln -s %{_bindir}/lsblk %{buildroot}/bin
ln -s %{_sbindir}/agetty %{buildroot}/sbin
ln -s %{_sbindir}/blockdev %{buildroot}/sbin
ln -s %{_sbindir}/cfdisk %{buildroot}/sbin
@@ -742,7 +750,9 @@
mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid
mkdir -p %{buildroot}/run/uuidd
%if !0%{?usrmerged}
+ln -s %{_bindir}/findmnt %{buildroot}/bin
ln -s %{_bindir}/logger %{buildroot}/bin
+ln -s %{_bindir}/lsblk %{buildroot}/bin
%endif
# clock.txt from uuidd is a ghost file
touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt
@@ -751,6 +761,9 @@
%if !%build_util_linux
%make_install
%endif
+%else
+rm -f %{buildroot}%{_mandir}/man8/findmnt.8*
+rm -f %{buildroot}%{_mandir}/man8/lsblk.8*
%endif
# link duplicate manpages and python bindings
%fdupes -s %{buildroot}%{_prefix}
@@ -929,9 +942,7 @@
/bin/more
/bin/mount
/bin/umount
-/bin/findmnt
/bin/login
-/bin/lsblk
/sbin/agetty
/sbin/blockdev
/sbin/ctrlaltdel
@@ -972,7 +983,6 @@
%{_bindir}/dmesg
%{_bindir}/fallocate
%{_bindir}/fincore
-%{_bindir}/findmnt
%{_bindir}/flock
%{_bindir}/getopt
%{_bindir}/hardlink
@@ -992,7 +1002,6 @@
%if 0%{?usrmerged}
%{_bindir}/login
%endif
-%{_bindir}/lsblk
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lsirq
@@ -1159,7 +1168,6 @@
%{_mandir}/man8/mkswap.8.gz
%{_mandir}/man8/mount.8.gz
%{_mandir}/man8/nologin.8.gz
-%{_mandir}/man8/findmnt.8.gz
%{_mandir}/man8/fsfreeze.8.gz
%{_mandir}/man8/swaplabel.8.gz
%{_mandir}/man8/readprofile.8.gz
@@ -1177,7 +1185,6 @@
%{_mandir}/man8/wipefs.8.gz
%{_mandir}/man8/zramctl.8.gz
%{_mandir}/man8/fstrim.8.gz
-%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz
%{_mandir}/man8/sulogin.8.gz
%{_mandir}/man8/wdctl.8.gz
@@ -1192,7 +1199,9 @@
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/*
%if %build_util_linux_systemd
+%exclude %{_datadir}/bash-completion/completions/findmnt
%exclude %{_datadir}/bash-completion/completions/logger
+%exclude %{_datadir}/bash-completion/completions/lsblk
%exclude %{_datadir}/bash-completion/completions/lslogins
%exclude %{_datadir}/bash-completion/completions/uuidd
%endif
@@ -1319,9 +1328,13 @@
%endif
%defattr(-, root, root)
%if !0%{?usrmerged}
+/bin/findmnt
/bin/logger
+/bin/lsblk
%endif
+%{_bindir}/findmnt
%{_bindir}/logger
+%{_bindir}/lsblk
%{_bindir}/lslogins
#BEGIN bootstrap_hack
%if 0%{?suse_version} < 1330
@@ -1332,10 +1345,14 @@
%dir %{_datadir}/bash-completion/completions
%endif
#END bootstrap_hack
+%{_datadir}/bash-completion/completions/findmnt
%{_datadir}/bash-completion/completions/logger
+%{_datadir}/bash-completion/completions/lsblk
%{_datadir}/bash-completion/completions/lslogins
%{_mandir}/man1/logger.1.gz
%{_mandir}/man1/lslogins.1.gz
+%{_mandir}/man8/lsblk.8.gz
+%{_mandir}/man8/findmnt.8.gz
%{_sbindir}/rcfstrim
%{_unitdir}/fstrim.service
%{_unitdir}/fstrim.timer
++++++ util-linux.spec ++++++
--- /var/tmp/diff_new_pack.8XOXCL/_old 2021-02-08 11:47:13.069689626 +0100
+++ /var/tmp/diff_new_pack.8XOXCL/_new 2021-02-08 11:47:13.069689626 +0100
@@ -105,6 +105,7 @@
BuildRequires: librtas-devel
%endif
%if %build_util_linux_systemd
+BuildRequires: libudev-devel
BuildRequires: socat
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd)
@@ -201,8 +202,8 @@
Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/bin/logger
-# Service files are being migrated during the update from SLE < 12 and
openSUSE <= 13.1
-Conflicts: util-linux < 2.25
+# findmnt and lsblk are being migrated during the update from SLE < 12SP3 and
openSUSE < Leap 15.3
+Conflicts: util-linux < 2.36.1
%systemd_requires
%else
# ERROR: No build_* variables are set.
@@ -423,8 +424,8 @@
# sources to prevent building of systemd-less versions.
#
# WARNING: Never edit following line without doing all suggested in the echo
below!
-UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/logger.c
./misc-utils/uuidd.c '
-UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIBSYSTEMD' . | fgrep '.c' |
LC_ALL=C sort | tr '\n' ' ')
+UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/findmnt.c
./misc-utils/logger.c ./misc-utils/lsblk-properties.c ./misc-utils/uuidd.c '
+UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIB\(SYSTEMD\|UDEV\)' . | fgrep
'.c' | LC_ALL=C sort | tr '\n' ' ')
if test "$UTIL_LINUX_KNOWN_SYSTEMD_DEPS" != "$UTIL_LINUX_FOUND_SYSTEMD_DEPS" ;
then
echo "List of utilities depending on systemd have changed.
Please check the new util-linux-systemd file list, file removal and update of
Conflicts for safe update!
@@ -434,6 +435,13 @@
exit 1
fi
#END SYSTEMD SAFETY CHECK
+#BEGIN FIRST STAGE MODIFICATIONS
+%if ! %build_util_linux_systemd
+sed -i 's/if BUILD_FINDMNT/if FALSE/
+ s/if BUILD_LSBLK/if FALSE/
+ ' misc-utils/Makemodule.am
+%endif
+#END FIRST STAGE MODIFICATIONS
%else
#BEGIN SECOND STAGE MODIFICATIONS
# delete all make modules except wanted ones
@@ -444,7 +452,7 @@
%if %build_util_linux_systemd
# for lslogins
/login-utils/b 1
-# for logger and uuidd
+# for findmnt, logger, lsblk and uuidd
/misc-utils/b 1
# for fstrim.service and fstrim.timer
/sys-utils/b 1
@@ -474,8 +482,10 @@
# disable all make modules except wanted ones
sed -i '/^if BUILD_/{
%if %build_util_linux_systemd
- /LSLOGINS/b 1
+ /FINDMNT/b 1
/LOGGER/b 1
+ /LSBLK/b 1
+ /LSLOGINS/b 1
/UUIDD/b 1
/BASH_COMPLETION/b 1
%endif
@@ -646,8 +656,6 @@
ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin
ln -s %{_bindir}/umount %{buildroot}/bin
-ln -s %{_bindir}/findmnt %{buildroot}/bin
-ln -s %{_bindir}/lsblk %{buildroot}/bin
ln -s %{_sbindir}/agetty %{buildroot}/sbin
ln -s %{_sbindir}/blockdev %{buildroot}/sbin
ln -s %{_sbindir}/cfdisk %{buildroot}/sbin
@@ -742,7 +750,9 @@
mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid
mkdir -p %{buildroot}/run/uuidd
%if !0%{?usrmerged}
+ln -s %{_bindir}/findmnt %{buildroot}/bin
ln -s %{_bindir}/logger %{buildroot}/bin
+ln -s %{_bindir}/lsblk %{buildroot}/bin
%endif
# clock.txt from uuidd is a ghost file
touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt
@@ -751,6 +761,9 @@
%if !%build_util_linux
%make_install
%endif
+%else
+rm -f %{buildroot}%{_mandir}/man8/findmnt.8*
+rm -f %{buildroot}%{_mandir}/man8/lsblk.8*
%endif
# link duplicate manpages and python bindings
%fdupes -s %{buildroot}%{_prefix}
@@ -929,9 +942,7 @@
/bin/more
/bin/mount
/bin/umount
-/bin/findmnt
/bin/login
-/bin/lsblk
/sbin/agetty
/sbin/blockdev
/sbin/ctrlaltdel
@@ -972,7 +983,6 @@
%{_bindir}/dmesg
%{_bindir}/fallocate
%{_bindir}/fincore
-%{_bindir}/findmnt
%{_bindir}/flock
%{_bindir}/getopt
%{_bindir}/hardlink
@@ -992,7 +1002,6 @@
%if 0%{?usrmerged}
%{_bindir}/login
%endif
-%{_bindir}/lsblk
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lsirq
@@ -1159,7 +1168,6 @@
%{_mandir}/man8/mkswap.8.gz
%{_mandir}/man8/mount.8.gz
%{_mandir}/man8/nologin.8.gz
-%{_mandir}/man8/findmnt.8.gz
%{_mandir}/man8/fsfreeze.8.gz
%{_mandir}/man8/swaplabel.8.gz
%{_mandir}/man8/readprofile.8.gz
@@ -1177,7 +1185,6 @@
%{_mandir}/man8/wipefs.8.gz
%{_mandir}/man8/zramctl.8.gz
%{_mandir}/man8/fstrim.8.gz
-%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz
%{_mandir}/man8/sulogin.8.gz
%{_mandir}/man8/wdctl.8.gz
@@ -1192,7 +1199,9 @@
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/*
%if %build_util_linux_systemd
+%exclude %{_datadir}/bash-completion/completions/findmnt
%exclude %{_datadir}/bash-completion/completions/logger
+%exclude %{_datadir}/bash-completion/completions/lsblk
%exclude %{_datadir}/bash-completion/completions/lslogins
%exclude %{_datadir}/bash-completion/completions/uuidd
%endif
@@ -1319,9 +1328,13 @@
%endif
%defattr(-, root, root)
%if !0%{?usrmerged}
+/bin/findmnt
/bin/logger
+/bin/lsblk
%endif
+%{_bindir}/findmnt
%{_bindir}/logger
+%{_bindir}/lsblk
%{_bindir}/lslogins
#BEGIN bootstrap_hack
%if 0%{?suse_version} < 1330
@@ -1332,10 +1345,14 @@
%dir %{_datadir}/bash-completion/completions
%endif
#END bootstrap_hack
+%{_datadir}/bash-completion/completions/findmnt
%{_datadir}/bash-completion/completions/logger
+%{_datadir}/bash-completion/completions/lsblk
%{_datadir}/bash-completion/completions/lslogins
%{_mandir}/man1/logger.1.gz
%{_mandir}/man1/lslogins.1.gz
+%{_mandir}/man8/lsblk.8.gz
+%{_mandir}/man8/findmnt.8.gz
%{_sbindir}/rcfstrim
%{_unitdir}/fstrim.service
%{_unitdir}/fstrim.timer
