summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/coreutils.changes3
-rw-r--r--packaging/coreutils.spec1
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 636e2b42b..88f4f9b5c 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