upgrade from v2.40.1 to v2.40.2

https://kernel.org/pub/linux/utils/util-linux/v2.40/v2.40.2-ReleaseNotes
(cherry picked from commit abe9339a37)

.gitignore

@@ -95,3 +95,6 @@
 /util-linux-2.39.2.tar.xz
 /util-linux-2.39.3.tar.xz
 /util-linux-2.40-rc1.tar.xz
+/util-linux-2.40.tar.xz
+/util-linux-2.40.1.tar.xz
+/util-linux-2.40.2.tar.xz

sources

@@ -1 +1 @@
-SHA512 (util-linux-2.40-rc1.tar.xz) = ba307c4686c7989c1d563f19ca6a1c06c237de2fe063a51e28aaefee7a1afab49deb94abd80b4263c2d671f791798112b287dc3f1b3d73d755119e01883aaeb0
+SHA512 (util-linux-2.40.2.tar.xz) = ffe20b915a518a150401d429b0338bc7022190e4ca0ef91a6d9eea345db8c1e11ad01784163b8fcf978506f3f5cad473f29d5d4ef93a4c66a5ae0ebd9fb0c8f2

util-linux.spec

@@ -1,13 +1,14 @@
 ### Header
 Summary: Collection of basic system utilities
 Name: util-linux
-Version: 2.40
-Release: %autorelease -p -e rc1
-License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
+Version: 2.40.2
+# -p -e rc1
+Release: %autorelease
+License: GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-Fedora-Public-Domain
 URL: https://en.wikipedia.org/wiki/Util-linux
 
 ### Macros
-%global upstream_version %{version}-rc1
+%global upstream_version %{version}
 %global upstream_major %(eval echo %{version} | sed -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/')
 
 %global compldir %{_datadir}/bash-completion/completions/
@@ -48,7 +49,6 @@ Source0: https://www.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/ut
 Source1: util-linux-login.pamd
 Source2: util-linux-remote.pamd
 Source3: util-linux-chsh-chfn.pamd
-Source4: uuidd-tmpfiles.conf
 Source5: adjtime
 Source12: util-linux-su.pamd
 Source13: util-linux-su-l.pamd
@@ -107,7 +107,8 @@ program.
 
 %package -n util-linux-core
 Summary: The most essential utilities from the util-linux suite
-License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
+License: GPL-2.0-only AND GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-Fedora-Public-Domain
+
 Provides: /bin/dmesg
 Provides: /bin/kill
 Provides: /bin/more
@@ -133,7 +134,7 @@ minimal installations.
 
 %package -n libfdisk
 Summary: Partitioning library for fdisk-like programs
-License: LGPLv2+
+License: LGPL-2.1-or-later
 
 %description -n libfdisk
 This is library for fdisk-like programs, part of util-linux.
@@ -141,7 +142,7 @@ This is library for fdisk-like programs, part of util-linux.
 
 %package -n libfdisk-devel
 Summary:  Partitioning library for fdisk-like programs
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libfdisk%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -152,7 +153,7 @@ part of util-linux.
 
 %package -n libsmartcols
 Summary: Formatting library for ls-like programs
-License: LGPLv2+
+License: LGPL-2.1-or-later
 
 %description -n libsmartcols
 This is library for ls-like terminal programs, part of util-linux.
@@ -160,7 +161,7 @@ This is library for ls-like terminal programs, part of util-linux.
 
 %package -n libsmartcols-devel
 Summary: Formatting library for ls-like programs
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libsmartcols%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -171,7 +172,7 @@ part of util-linux.
 
 %package -n libmount
 Summary: Device mounting library
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libblkid%{?_isa} = %{version}-%{release}
 Requires: libuuid%{?_isa} = %{version}-%{release}
 Conflicts: filesystem < 3
@@ -182,7 +183,7 @@ This is the device mounting library, part of util-linux.
 
 %package -n libmount-devel
 Summary: Device mounting library
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libmount%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -193,7 +194,7 @@ part of util-linux.
 
 %package -n libblkid
 Summary: Block device ID library
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libuuid%{?_isa} = %{version}-%{release}
 Conflicts: filesystem < 3
 
@@ -203,7 +204,7 @@ This is block device identification library, part of util-linux.
 
 %package -n libblkid-devel
 Summary: Block device ID library
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libblkid%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -214,7 +215,7 @@ part of util-linux.
 
 %package -n libuuid
 Summary: Universally unique ID library
-License: BSD
+License: BSD-3-Clause
 Conflicts: filesystem < 3
 
 %description -n libuuid
@@ -231,7 +232,7 @@ See also the "uuid" package, which is a separate implementation.
 
 %package -n libuuid-devel
 Summary: Universally unique ID library
-License: BSD
+License: BSD-3-Clause AND LGPL-2.1-or-later
 Requires: libuuid%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -252,7 +253,7 @@ See also the "uuid-devel" package, which is a separate implementation.
 %package -n uuidd
 Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
 Requires: libuuid = %{version}-%{release}
-License: GPLv2
+License: GPL-2.0-only
 Requires(pre): shadow-utils
 %{?systemd_ordering}
 
@@ -265,7 +266,7 @@ SMP systems.
 %package -n %{pypkg}-libmount
 Summary: Python bindings for the libmount library
 Requires: libmount%{?_isa} = %{version}-%{release}
-License: LGPLv2+
+License: LGPL-2.1-or-later
 
 %description -n %{pypkg}-libmount
 The libmount-python package contains a module that permits applications
@@ -277,7 +278,7 @@ mountinfo, etc) and mount filesystems.
 %package -n util-linux-i18n
 Summary: Internationalization pack for util-linux
 Requires: util-linux = %{version}-%{release}
-License: GPLv2
+License: GPL-2.0-or-later
 
 %description -n util-linux-i18n
 Internationalization pack with translated messages and manual pages for
@@ -340,13 +341,11 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_mandir}/man{1,6,8,5}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_sysconfdir}/{pam.d,security/console.apps}
-mkdir -p %{buildroot}%{_tmpfilesdir}/tmpfiles.d
 
 # install util-linux
 %make_install
 
 # And a dirs uuidd needs that the makefiles don't create
-install -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/uuidd.conf
 install -d %{buildroot}/run/uuidd
 install -d %{buildroot}/var/lib/libuuid
 
@@ -775,6 +774,7 @@ fi
 
 
 %files -n util-linux-core
+%license Documentation/licenses/*
 %attr(4755,root,root)	%{_bindir}/mount
 %attr(4755,root,root)	%{_bindir}/umount
 %{_bindir}/chrt
@@ -866,52 +866,55 @@ fi
 
 
 %files -n uuidd
-%license Documentation/licenses/COPYING.GPL-2.0-or-later
+%license Documentation/licenses/COPYING.GPL-2.0-only
 %{_mandir}/man8/uuidd.8*
 %{_sbindir}/uuidd
 %{_unitdir}/uuidd.*
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 %dir %attr(2775, uuidd, uuidd) /run/uuidd
 %{compldir}/uuidd
-%{_tmpfilesdir}/uuidd.conf
+%{_tmpfilesdir}/uuidd-tmpfiles.conf
 
 
 %files -n libfdisk
-%license Documentation/licenses/COPYING.LGPL-2.1-or-later libfdisk/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libfdisk.so.*
 
 %files -n libfdisk-devel
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libfdisk.so
 %{_includedir}/libfdisk
 %{_libdir}/pkgconfig/fdisk.pc
 
 
 %files -n libsmartcols
-%license Documentation/licenses/COPYING.LGPL-2.1-or-later libsmartcols/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libsmartcols.so.*
 
 %files -n libsmartcols-devel
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libsmartcols.so
 %{_includedir}/libsmartcols
 %{_libdir}/pkgconfig/smartcols.pc
 
 
 %files -n libmount
-%license Documentation/licenses/COPYING.LGPL-2.1-or-later libmount/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libmount.so.*
 
 %files -n libmount-devel
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libmount.so
 %{_includedir}/libmount
 %{_libdir}/pkgconfig/mount.pc
 
 
 %files -n libblkid
-%doc libblkid/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libblkid.so.*
 
 %files -n libblkid-devel
-%doc libblkid/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libblkid.so
 %{_includedir}/blkid
 %{_mandir}/man3/libblkid.3*
@@ -919,10 +922,11 @@ fi
 
 
 %files -n libuuid
-%license Documentation/licenses/COPYING.BSD-3-Clause libuuid/COPYING
+%license Documentation/licenses/COPYING.BSD-3-Clause
 %{_libdir}/libuuid.so.*
 
 %files -n libuuid-devel
+%license Documentation/licenses/COPYING.BSD-3-Clause Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libuuid.so
 %{_includedir}/uuid
 %{_mandir}/man3/uuid.3*
@@ -940,10 +944,11 @@ fi
 %{_libdir}/pkgconfig/uuid.pc
 
 %files -n %{pypkg}-libmount
-%license Documentation/licenses/COPYING.LGPL-2.1-or-later libmount/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/python*/site-packages/libmount/
 
 %files -n util-linux-i18n -f %{name}.lang
+%license Documentation/licenses/COPYING.GPL-2.0-or-later
 
 %changelog
 %autochangelog