From 8b794a5fc5f46ba6c500585ace73cc0ebc19f15f Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 19 Feb 2015 13:45:44 +0100 Subject: [PATCH] 2.26-1: upgrade to stable release --- .gitignore | 1 + 2.26-setarch-ppc.patch | 33 --------------------------------- sources | 2 +- util-linux.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 2.26-setarch-ppc.patch diff --git a/.gitignore b/.gitignore index 6250bdc..83370dc 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /util-linux-2.25.2.tar.xz /util-linux-2.26-rc1.tar.xz /util-linux-2.26-rc2.tar.xz +/util-linux-2.26.tar.xz diff --git a/2.26-setarch-ppc.patch b/2.26-setarch-ppc.patch deleted file mode 100644 index 93a80cd..0000000 --- a/2.26-setarch-ppc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d9ca5dd4426c8bcc779750362bf905395b1b08ef Mon Sep 17 00:00:00 2001 -From: Ruediger Meier -Date: Mon, 9 Feb 2015 16:11:02 +0100 -Subject: [PATCH] setarch: fix typo (missing braces) for ppcle - -Introduced in 77eb13b9, noticed on ppc64le. - -CC: Sami Kerola -Signed-off-by: Ruediger Meier ---- - sys-utils/setarch.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c -index c8ca5f8..76892ab 100644 ---- a/sys-utils/setarch.c -+++ b/sys-utils/setarch.c -@@ -160,9 +160,9 @@ static int set_arch(const char *pers, unsigned long options, int list) - {PER_LINUX, "ppc64pseries", "ppc64"}, - {PER_LINUX, "ppc64iseries", "ppc64"}, - # else -- PER_LINUX32, "ppc32le", "ppcle"}, -- PER_LINUX32, "ppcle", "ppcle"}, -- PER_LINUX, "ppc64le", "ppc64le"}, -+ {PER_LINUX32, "ppc32le", "ppcle"}, -+ {PER_LINUX32, "ppcle", "ppcle"}, -+ {PER_LINUX, "ppc64le", "ppc64le"}, - # endif - #endif - #if defined(__x86_64__) || defined(__i386__) || defined(__ia64__) --- -2.1.0 - diff --git a/sources b/sources index 57bf6c4..79b1640 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd12e74826ec1efa750a59ce1fd72057 util-linux-2.26-rc2.tar.xz +912c550a4e5c47c0ce9abd0733fa9a64 util-linux-2.26.tar.xz diff --git a/util-linux.spec b/util-linux.spec index c3dd883..6faec3f 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,12 +2,12 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.26 -Release: 0.4%{?dist} +Release: 1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux -%define upstream_version %{version}-rc2 +%define upstream_version %{version} ### Macros %define compldir %{_datadir}/bash-completion/completions/ @@ -78,9 +78,6 @@ Requires: libfdisk = %{version}-%{release} # 151635 - makeing /var/log/lastlog Patch0: 2.23-login-lastlog-create.patch -# fix PPC build -Patch1: 2.26-setarch-ppc.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 @@ -265,6 +262,7 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS" --enable-chfn-chsh \ --enable-write \ --enable-raw \ + --enable-libmount-force-mountinfo \ --with-python=3 \ --with-systemd \ --with-udev \ @@ -881,6 +879,9 @@ exit 0 %{_libdir}/python*/site-packages/libmount/* %changelog +* Thu Feb 19 2015 Karel Zak 2.26-1 +- upgrade to stable release 2.26 + * Tue Feb 10 2015 Karel Zak 2.26-0.4 - fix setarch build on PPC