Remove /bin/mktemp dep, and remove conflicting file

coreutils satisfies the 'mktemp' dependency, so remove the extra entry.

Also, groff provides /usr/bin/zsoelim, so do not ship it with man-db.

Change-Id: I43da2972018c60035f636dfdc9be89be7bda5780

diff --git a/packaging/man-db.changes b/packaging/man-db.changes
index fd2707f..46bd875 100644 (file)
--- a/packaging/man-db.changes
+++ b/packaging/man-db.changes
@@ -1,3 +1,7 @@
+* Fri Mar 15 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> 86d3c5b
+- Remove /bin/mktemp dependency, since this is satisfied by coreutils
+- Remove /usr/bin/zsoelim, provided by the groff package instead
+
 * Mon Mar 11 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> upstream/2.6.3@52bf9dc
 - Add packaging
 - Imported Upstream version 2.6.3

diff --git a/packaging/man-db.spec b/packaging/man-db.spec
index af04063..4c11100 100644 (file)
--- a/packaging/man-db.spec
+++ b/packaging/man-db.spec
@@ -10,7 +10,6 @@ BuildRequires:  db4-devel
 BuildRequires:  gettext
 BuildRequires:  groff
 BuildRequires:  pkgconfig(libpipeline)
-Requires:       /bin/mktemp
 Requires:       bzip2
 Requires:       coreutils
 Requires:       groff >= 1.18
@@ -52,6 +51,9 @@ make %{?_smp_mflags}
 
 rm -rf %{buildroot}%{_datadir}/doc/man-db
 
+# groff provides this file
+rm %{buildroot}%{_bindir}/zsoelim
+
 
 %lang_package
 
@@ -66,7 +68,6 @@ rm -rf %{buildroot}%{_datadir}/doc/man-db
 %{_bindir}/mandb
 %{_bindir}/manpath
 %{_bindir}/whatis
-%{_bindir}/zsoelim
 %{_sbindir}/accessdb
 %{_libdir}/man-db/libman-2.6.3.so
 %{_libdir}/man-db/libman.so