[man-pages-de/f21] exclude man-pages also contained in procps-ng >= 3.3.10

[Parag Nemade]

commit a92ebec2b09382b04505b9f5005f21900cc7d33c
Author: Parag Nemade <pnemade at redhat.com>
Date:   Sat Oct 4 21:31:36 2014 +0530

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

 man-pages-de.spec |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/man-pages-de.spec b/man-pages-de.spec
index b2eb51d..1a91a45 100644
--- a/man-pages-de.spec
+++ b/man-pages-de.spec
@@ -1,7 +1,7 @@
 Summary:        German man pages from the Linux Documentation Project
 Name:           man-pages-de
 Version:        1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv3+
 Group:          Documentation
 URL:            http://manpages-de.alioth.debian.org/
@@ -33,8 +33,26 @@ German.
 %prep
 
 %setup -q -n manpages-de-%{version}
-cd po/man1
+pushd po/man1
 mv -f ncal.1.po cal.1.po
+popd
+
+# These pages are provided by the procps-ng >= 3.3.10 package:
+rm -f po/man?/free.1*
+rm -f po/man?/kill.1*
+rm -f po/man?/pgrep.1*
+rm -f po/man?/pkill.1*
+rm -f po/man?/pmap.1*
+rm -f po/man?/pwdx.1*
+rm -f po/man?/skill.1*
+rm -f po/man?/slabtop.1*
+rm -f po/man?/tload.1*
+rm -f po/man?/uptime.1*
+rm -f po/man?/w.1*
+rm -f po/man?/watch.1*
+rm -f po/man?/sysctl.conf.5*
+rm -f po/man?/sysctl.8*
+rm -f po/man?/vmstat.8*
 
 %build
 %configure
@@ -48,7 +66,11 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 %{_mandir}/de/man?/*
 
 %changelog
-* Fri Oct 03 2014 Mario Blättermann <mario.blaettermann at gmail.com> - 1.7-2
+* Sat Oct 04 2014 Parag Nemade <pnemade AT redhat DOT com> - 1.7-3
+- exclude man-pages also contained in procps-ng >= 3.3.10
+- Resolves: rhbz#1149306 - File conflicts with procps-ng
+
+* Wed Sep 24 2014 Mario Blättermann <mario.blaettermann at gmail.com> - 1.7-2
 - Removed procps-ng from BR because that project now maintains
   its own translated man pages