From cb0695a1192378c2c4fb795530f2857942c3ff31 Mon Sep 17 00:00:00 2001 From: Ivana Hutarova Varekova Date: Mon, 30 Aug 2010 12:46:40 +0200 Subject: [PATCH] - provides man tag - resolves: #621688 remove problematic man-pages (now in man-pages-de package) --- man-db.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 154dc33..f1394ff 100644 --- a/man-db.spec +++ b/man-db.spec @@ -3,7 +3,7 @@ Summary: Database cached manual pager suite Name: man-db Version: 2.5.7 -Release: 2%{?dist} +Release: 3%{?dist} # project man-db GPLv2+ # Gnulib part GPLv3+ License: GPLv2+ and GPLv3+ @@ -16,6 +16,7 @@ Source2: man-db.sysconfig Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: man < 2.0 Provides: man-pages-reader +Provides: man Conflicts: man Requires: less, coreutils, grep, groff, gzip, crontabs BuildRequires: gdbm-devel, groff, gettext @@ -51,6 +52,13 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/man-db/* ./ rm $RPM_BUILD_ROOT%{_bindir}/zsoelim rm $RPM_BUILD_ROOT%{_datadir}/man/man1/zsoelim.1 +# remove pages which are also in man-pages-de +rm $RPM_BUILD_ROOT%{_mandir}/de/man1/zsoelim.1 +rm $RPM_BUILD_ROOT%{_mandir}/de/man1/manpath.1 +rm $RPM_BUILD_ROOT%{_mandir}/de/man5/manpath.5 +rm $RPM_BUILD_ROOT%{_mandir}/de/man8/catman.8 +rm $RPM_BUILD_ROOT%{_mandir}/de/man8/mandb.8 + # install cache directory install -d -m 0755 $RPM_BUILD_ROOT%{cache} @@ -104,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT %lang(ja) %{_datadir}/man/ja/man*/* %changelog +* Mon Aug 16 2010 Ivana Hutarova Varekova - 2.5.7-3 +- provides man tag +- resolves: #621688 + remove problematic man-pages (now in man-pages-de package) + * Fri Apr 16 2010 Ivana Hutarova Varekova - 2.5.7-2 - add conflicts tag