2.38-1: upgrade, spec file cleanup

This commit is contained in:
Karel Zak 2022-03-30 13:15:41 +02:00
parent 3b965f951d
commit 6578411a87
3 changed files with 11 additions and 9 deletions

1
.gitignore vendored
View File

@ -85,3 +85,4 @@
/util-linux-2.37.2.tar.xz /util-linux-2.37.2.tar.xz
/util-linux-2.38-rc1.tar.xz /util-linux-2.38-rc1.tar.xz
/util-linux-2.38-rc3.tar.xz /util-linux-2.38-rc3.tar.xz
/util-linux-2.38.tar.xz

View File

@ -1 +1 @@
SHA512 (util-linux-2.38-rc3.tar.xz) = b30d95afb829239320e6a7b586cf87e237aff5ddb254c01c4d525c298dd59b5850bea4abcd59b2a4f5a2300b7f84545b2ee8cd16375221abacc388a7f101dfcf SHA512 (util-linux-2.38.tar.xz) = d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c

View File

@ -2,12 +2,12 @@
Summary: Collection of basic system utilities Summary: Collection of basic system utilities
Name: util-linux Name: util-linux
Version: 2.38 Version: 2.38
Release: 0.5%{?dist} Release: 1%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
URL: https://en.wikipedia.org/wiki/Util-linux URL: https://en.wikipedia.org/wiki/Util-linux
### Macros ### Macros
%global upstream_version %{version}-rc3 %global upstream_version %{version}
%global upstream_major %(eval echo %{version} | sed -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/') %global upstream_major %(eval echo %{version} | sed -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/')
%global compldir %{_datadir}/bash-completion/completions/ %global compldir %{_datadir}/bash-completion/completions/
@ -32,10 +32,6 @@ BuildRequires: libuser-devel
BuildRequires: libcap-ng-devel BuildRequires: libcap-ng-devel
BuildRequires: %{pypkg}-devel BuildRequires: %{pypkg}-devel
BuildRequires: gcc BuildRequires: gcc
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: bison
BuildRequires: rubygem-asciidoctor BuildRequires: rubygem-asciidoctor
%ifarch ppc64le %ifarch ppc64le
BuildRequires: librtas-devel BuildRequires: librtas-devel
@ -291,8 +287,8 @@ chfn and chsh utilities with dependence on libuser.
%build %build
unset LINGUAS || : unset LINGUAS || :
# unfortunately, we did changes to build-system # enable only when make a change to the build-system
./autogen.sh #./autogen.sh
export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS" export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
@ -918,6 +914,11 @@ fi
%{_libdir}/python*/site-packages/libmount/ %{_libdir}/python*/site-packages/libmount/
%changelog %changelog
* Wed Mar 30 2022 Karel Zak <kzak@redhat.com> - 2.38-1
- upgrade to v2.38
- don't (re)generate build-system
- modernize spec file style (thanks to Zbigniew)
* Thu Feb 17 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.38-0.5 * Thu Feb 17 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.38-0.5
- Drop very old upgrade scriptlet for libblkid - Drop very old upgrade scriptlet for libblkid