2.38-1: upgrade, cleanup

The final v2.38 is already for 2 months in rawhide; let's update f36
too. It's strange to use -rc1 in stable Fedora release.
This commit is contained in:
Karel Zak 2022-06-01 14:42:52 +02:00
parent 5abc3df64a
commit e6a1d6757d
3 changed files with 22 additions and 19 deletions

1
.gitignore vendored
View File

@ -84,3 +84,4 @@
/util-linux-2.37.tar.xz
/util-linux-2.37.2.tar.xz
/util-linux-2.38-rc1.tar.xz
/util-linux-2.38.tar.xz

View File

@ -1 +1 @@
SHA512 (util-linux-2.38-rc1.tar.xz) = bffcf794c633c927dd61a9813fc43cbbf996a08c788a63c754d745c9eadbe23abc161db25d4126e63422b694d73480f88e0d960b065d529190192f3b98690868
SHA512 (util-linux-2.38.tar.xz) = d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c

View File

@ -2,12 +2,12 @@
Summary: Collection of basic system utilities
Name: util-linux
Version: 2.38
Release: 0.3%{?dist}
Release: 1%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
URL: https://en.wikipedia.org/wiki/Util-linux
### Macros
%define upstream_version %{version}-rc1
%define upstream_version %{version}
%define upstream_major %(eval echo %{version} | %{__sed} -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/')
%define compldir %{_datadir}/bash-completion/completions/
@ -26,16 +26,12 @@ BuildRequires: pam-devel
BuildRequires: zlib-devel
BuildRequires: popt-devel
BuildRequires: libutempter-devel
Buildrequires: systemd-devel
BuildRequires: systemd-devel
BuildRequires: systemd
Buildrequires: libuser-devel
BuildRequires: libuser-devel
BuildRequires: libcap-ng-devel
BuildRequires: %{pypkg}-devel
BuildRequires: gcc
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: bison
BuildRequires: rubygem-asciidoctor
%ifarch ppc64le
BuildRequires: librtas-devel
@ -101,12 +97,12 @@ Patch1: login-default-motd-file.patch
%description
The util-linux package contains a large variety of low-level system
utilities that are necessary for a Linux system to function. Among
others, Util-linux contains the fdisk configuration tool and the login
others, util-linux contains the fdisk configuration tool and the login
program.
%package -n util-linux-core
Summary: The most essential utilities from the util-linux suite.
Summary: The most essential utilities from the util-linux suite
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
Provides: /bin/dmesg
Provides: /bin/kill
@ -132,7 +128,7 @@ minimal installations.
%package -n libfdisk
Summary: Partitioning library for fdisk-like programs.
Summary: Partitioning library for fdisk-like programs
License: LGPLv2+
%description -n libfdisk
@ -140,7 +136,7 @@ This is library for fdisk-like programs, part of util-linux.
%package -n libfdisk-devel
Summary: Partitioning library for fdisk-like programs.
Summary: Partitioning library for fdisk-like programs
License: LGPLv2+
Requires: libfdisk%{?_isa} = %{version}-%{release}
Requires: pkgconfig
@ -151,7 +147,7 @@ part of util-linux.
%package -n libsmartcols
Summary: Formatting library for ls-like programs.
Summary: Formatting library for ls-like programs
License: LGPLv2+
%description -n libsmartcols
@ -159,7 +155,7 @@ This is library for ls-like terminal programs, part of util-linux.
%package -n libsmartcols-devel
Summary: Formatting library for ls-like programs.
Summary: Formatting library for ls-like programs
License: LGPLv2+
Requires: libsmartcols%{?_isa} = %{version}-%{release}
Requires: pkgconfig
@ -278,12 +274,12 @@ mountinfo, etc) and mount filesystems.
%package -n util-linux-user
Summary: libuser based util-linux utilities
Summary: util-linux utilities based on libuser
Requires: util-linux = %{version}-%{release}
License: GPLv2
%description -n util-linux-user
chfn and chsh utilities with dependence on libuser
chfn and chsh utilities with dependence on libuser.
%prep
@ -292,8 +288,9 @@ chfn and chsh utilities with dependence on libuser
%build
unset LINGUAS || :
# unfortunately, we did changes to build-system
./autogen.sh
# enable only when make a change to the build-system
#./autogen.sh
export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
@ -930,6 +927,11 @@ fi
%{_libdir}/python*/site-packages/libmount/
%changelog
* Wed Jun 1 2022 Karel Zak <kzak@redhat.com> - 2.38-1
- upgrade to the final v2.38
- don't (re)generate build-system
- minor spec file cleanup
* Wed Feb 2 2022 Karel Zak <kzak@redhat.com> - 2.38-0.3
- add /usr/lib/tmpfiles.d/uuidd.conf (based on #2047952)