- Fix typo in spec file. (CVS merge conflict leftovers)

This commit is contained in:
Pete Graner 2007-08-23 16:54:09 +00:00
parent 92f50fddd5
commit 7830c32cca

View File

@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 6.9 Version: 6.9
Release: 6%{?dist} Release: 7%{?dist}
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -280,6 +280,9 @@ fi
/sbin/runuser /sbin/runuser
%changelog %changelog
* Thu Aug 23 2007 Pete Graner <pgraner@redhat.com> - 6.9-7
- Fix typo in spec file. (CVS merge conflict leftovers)
* Thu Aug 23 2007 Pete Graner <pgraner@redhat.com> - 6.9-6 * Thu Aug 23 2007 Pete Graner <pgraner@redhat.com> - 6.9-6
- Remove --all-name from spec file its now provided in the upstream rpm's find-lang.sh - Remove --all-name from spec file its now provided in the upstream rpm's find-lang.sh
- Rebuild - Rebuild
@ -288,7 +291,6 @@ fi
- Don't generate runuser.1 since we ship a complete manpage for it - Don't generate runuser.1 since we ship a complete manpage for it
(bug #241662). (bug #241662).
>>>>>>> 1.175
* Wed Jul 4 2007 Tim Waugh <twaugh@redhat.com> 6.9-4 * Wed Jul 4 2007 Tim Waugh <twaugh@redhat.com> 6.9-4
- Use hard links instead of symbolic links for LC_TIME files (bug #246729). - Use hard links instead of symbolic links for LC_TIME files (bug #246729).