diff options
| author | Patrick McCarty <patrick.mccarty@linux.intel.com> | 2013-04-01 11:00:15 -0700 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-08-09 00:10:27 -0400 |
| commit | 9355146fafe232682fe05448a440553fda9a7c7a (patch) | |
| tree | d730313a28e61db62cad8d14e2379786993256ba | |
| parent | c037456af0051729469bbc07e7edbe48db2e5afd (diff) | |
| download | coreutils-9355146fafe232682fe05448a440553fda9a7c7a.tar.gz coreutils-9355146fafe232682fe05448a440553fda9a7c7a.tar.bz2 coreutils-9355146fafe232682fe05448a440553fda9a7c7a.zip | |
Fix conflict with procps-ng package
/usr/bin/uptime is part of the procps-ng package, so it must be excluded
from this package for procps-ng to install cleanly.
Change-Id: I97ecd8335d4d6e5288ed34eb73d4f4479f499400
| -rw-r--r-- | packaging/coreutils.changes | 3 | ||||
| -rw-r--r-- | packaging/coreutils.spec | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packaging/coreutils.changes b/packaging/coreutils.changes index 4ba184dad..1124dc8e3 100644 --- a/packaging/coreutils.changes +++ b/packaging/coreutils.changes @@ -1,3 +1,6 @@ +* Mon Apr 01 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> accepted/trunk/20130322.191118@6e813e8 +- Fix conflict with procps-ng package (remove /usr/bin/uptime) + * Fri Mar 22 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130115.052153@4a589f5 - Fixed package groups diff --git a/packaging/coreutils.spec b/packaging/coreutils.spec index 852ac7bfc..2c1277c80 100644 --- a/packaging/coreutils.spec +++ b/packaging/coreutils.spec @@ -51,6 +51,7 @@ AUTOPOINT=true autoreconf -fi export CFLAGS="%optflags -Wall" %configure --libexecdir=%{_libdir} --without-included-regex \ --enable-install-program=arch \ + --enable-no-install-program=uptime \ gl_cv_func_printf_directive_n=yes \ gl_cv_func_isnanl_works=yes \ DEFAULT_POSIX2_VERSION=199209 |