diff --git a/.gitignore b/.gitignore index a1ca0dd..0bd62c5 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /util-linux-2.33-rc2.tar.xz /util-linux-2.33.1.tar.xz /util-linux-2.33.2.tar.xz +/util-linux-2.34-rc1.tar.xz diff --git a/sources b/sources index 34116f3..67f556e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (util-linux-2.33.2.tar.xz) = ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749 +SHA512 (util-linux-2.34-rc1.tar.xz) = 4f968f04394f6beaafd60a84daf1db808ec486dbfa82d2f58b0678f93adc37477395a1b22c0c2af33f9652c5fa82f8bb3c1ce8b62146c983bce270fe45c1419b diff --git a/util-linux.spec b/util-linux.spec index 63863b3..84d45ce 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,13 +1,13 @@ ### Header Summary: A collection of basic system utilities Name: util-linux -Version: 2.33.2 -Release: 1%{?dist} +Version: 2.34 +Release: 0.1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: http://en.wikipedia.org/wiki/Util-linux ### Macros -%define upstream_version %{version} +%define upstream_version %{version}-rc1 %define upstream_major %(eval echo %{version} | %{__sed} -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/') %define compldir %{_datadir}/bash-completion/completions/ @@ -35,6 +35,7 @@ BuildRequires: systemd Buildrequires: libuser-devel BuildRequires: libcap-ng-devel BuildRequires: %{pypkg}-devel +BuildRequires: pcre2-devel BuildRequires: gcc ### Sources @@ -60,6 +61,9 @@ Provides: eject = 2.1.6 # rfkill has been merged into util-linux v2.31 Obsoletes: rfkill <= 0.5 Provides: rfkill = 0.5 +# hardlink has been merged into util-linux v2.34 +Obsoletes: hardlink <= 1:1.3-9 +Provides: hardlink = 1:1.3-9 # sulogin, utmpdump merged into util-linux v2.22; # last, lastb merged into util-linux v2.24 Conflicts: sysvinit-tools < 2.88-14 @@ -276,6 +280,7 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS" --enable-usrdir-path \ --enable-write \ --enable-raw \ + --enable-hardlink \ --with-python=%{pyver} \ --with-systemd \ --with-udev \ @@ -508,6 +513,7 @@ fi %{_bindir}/findmnt %{_bindir}/flock %{_bindir}/getopt +%{_bindir}/hardlink %{_bindir}/hexdump %{_bindir}/ionice %{_bindir}/ipcmk @@ -565,6 +571,7 @@ fi %{_mandir}/man1/fincore.1* %{_mandir}/man1/flock.1* %{_mandir}/man1/getopt.1* +%{_mandir}/man1/hardlink.1* %{_mandir}/man1/hexdump.1* %{_mandir}/man1/ionice.1* %{_mandir}/man1/ipcmk.1* @@ -908,6 +915,11 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Tue Apr 30 2019 Karel Zak - 2.34-0.1 +- add command hardlink(1) (merged into util-linux upstream) +- upgrade to v2.34-rc1 + http://www.kernel.org/pub/linux/utils/util-linux/v2.34/v2.34-ReleaseNotes + * Tue Apr 9 2019 Karel Zak - 2.33.2-1 - upgrade to v2.33.2 https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.33/v2.33.2-ReleaseNotes