resolve conflict

This commit is contained in:
Ondřej Vašík 2012-01-05 15:35:32 +01:00
commit 04f29fa71b

View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 8.14 Version: 8.14
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -322,9 +322,12 @@ fi
%{?!norunuser:/sbin/runuser} %{?!norunuser:/sbin/runuser}
%changelog %changelog
* Thu Jan 05 2011 Ondrej Vasik <ovasik@redhat.com> - 8.14-4 * Thu Jan 05 2011 Ondrej Vasik <ovasik@redhat.com> - 8.14-5
- fix pr -c and pr -v segfault with multibyte locales - fix pr -c and pr -v segfault with multibyte locales
* Mon Oct 31 2011 Rex Dieter <rdieter@fedoraproject.org> 8.14-4
- rebuild (gmp), last time, I promise
* Mon Oct 24 2011 Ondrej Vasik <ovasik@redhat.com> - 8.14-3 * Mon Oct 24 2011 Ondrej Vasik <ovasik@redhat.com> - 8.14-3
- require at least pam 1.1.3-7 (#748215) - require at least pam 1.1.3-7 (#748215)