[man-pages-fr] Resolves: rhbz#1146203 - File conflicts with procps-ng

[Mike FABIAN]

commit 305d4c2ba1bc62a6969c6e50f2c0f7205a8d7435
Author: Mike FABIAN <mfabian at redhat.com>
Date:   Thu Sep 25 11:37:19 2014 +0200

    Resolves: rhbz#1146203 - File conflicts with procps-ng
    
    - exclude man-pages also contained in procps-ng >= 3.3.10

 man-pages-fr.spec |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/man-pages-fr.spec b/man-pages-fr.spec
index a952223..659d9b7 100644
--- a/man-pages-fr.spec
+++ b/man-pages-fr.spec
@@ -5,7 +5,7 @@
 Summary:	French version of the Linux man-pages
 Name:		man-pages-fr
 Version:	3.66
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and GPLv3+ and ImageMagick and ISC and Public Domain and BSD and MIT and ASL 2.0 and and UCD and IBM and TCL and xinetd
 Group:		Documentation
 URL:		https://alioth.debian.org/projects/perkamon/
@@ -100,6 +100,23 @@ done
 # These pages are provided by the awesome package
 %{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/awesome*
 
+# These pages are provided by the procps-ng >= 3.3.10 package:
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/free.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/kill.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/pgrep.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/pkill.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/pmap.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/pwdx.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/skill.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/slabtop.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/tload.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/uptime.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/w.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/watch.1
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/sysctl.conf.5
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/sysctl.8
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/vmstat.8
+
 #LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/
 
 %files
@@ -107,6 +124,10 @@ done
 %{_mandir}/fr/man?/*
 
 %changelog
+* Thu Sep 25 2014 Mike FABIAN <mfabian at redhat.com> - 3.66-3
+- exclude man-pages also contained in procps-ng >= 3.3.10
+- Resolves: rhbz#1146203 - File conflicts with procps-ng
+
 * Thu Sep 04 2014 Mike FABIAN <mfabian at redhat.com> - 3.66-2
 - Mark du.1 man-page as out-of-date (Resolves: rhbz#1135541)