From 6578411a87f61693a3d87aca79599613f4ef20f1 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 30 Mar 2022 13:15:41 +0200 Subject: [PATCH] 2.38-1: upgrade, spec file cleanup --- .gitignore | 1 + sources | 2 +- util-linux.spec | 17 +++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8d82a3c..7ff827f 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /util-linux-2.37.2.tar.xz /util-linux-2.38-rc1.tar.xz /util-linux-2.38-rc3.tar.xz +/util-linux-2.38.tar.xz diff --git a/sources b/sources index 376b738..ab8cbd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (util-linux-2.38-rc3.tar.xz) = b30d95afb829239320e6a7b586cf87e237aff5ddb254c01c4d525c298dd59b5850bea4abcd59b2a4f5a2300b7f84545b2ee8cd16375221abacc388a7f101dfcf +SHA512 (util-linux-2.38.tar.xz) = d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c diff --git a/util-linux.spec b/util-linux.spec index 85c482d..2dc911e 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,12 +2,12 @@ Summary: Collection of basic system utilities Name: util-linux Version: 2.38 -Release: 0.5%{?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 -%global upstream_version %{version}-rc3 +%global upstream_version %{version} %global upstream_major %(eval echo %{version} | sed -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/') %global compldir %{_datadir}/bash-completion/completions/ @@ -32,10 +32,6 @@ 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 @@ -291,8 +287,8 @@ 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" @@ -918,6 +914,11 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Wed Mar 30 2022 Karel Zak - 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 - 2.38-0.5 - Drop very old upgrade scriptlet for libblkid