2.26-1: upgrade to stable release
This commit is contained in:
parent
aa5805ac25
commit
eab90e03d7
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
@ -1,33 +0,0 @@
|
||||
From d9ca5dd4426c8bcc779750362bf905395b1b08ef Mon Sep 17 00:00:00 2001
|
||||
From: Ruediger Meier <ruediger.meier@ga-group.nl>
|
||||
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 <kerolasa@iki.fi>
|
||||
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
|
||||
---
|
||||
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
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
cd12e74826ec1efa750a59ce1fd72057 util-linux-2.26-rc2.tar.xz
|
||||
912c550a4e5c47c0ce9abd0733fa9a64 util-linux-2.26.tar.xz
|
||||
|
@ -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 <kzak@redhat.com> 2.26-1
|
||||
- upgrade to stable release 2.26
|
||||
|
||||
* Tue Feb 10 2015 Karel Zak <kzak@redhat.com> 2.26-0.4
|
||||
- fix setarch build on PPC
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user