From 541614785636c48f58ee8f89252078921d07b583 Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Mon, 13 Oct 2014 12:50:29 +0200
Subject: [PATCH] - Resolving file conflicts with man-pages-* - Replacing
 hardcoded paths with macros - Making the i18n subpackage noarch

---
 procps-ng.spec | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/procps-ng.spec b/procps-ng.spec
index b501e31..5fc60eb 100644
--- a/procps-ng.spec
+++ b/procps-ng.spec
@@ -4,7 +4,7 @@
 Summary: System and process monitoring utilities
 Name: procps-ng
 Version: 3.3.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
 Group: Applications/System
 URL: https://sourceforge.net/projects/procps-ng/
@@ -36,6 +36,10 @@ Provides: /bin/ps
 Obsoletes: sysvinit-tools < 0:2.89
 Provides: /sbin/pidof
 
+# fortunately the same release number for f21 and f22
+Conflicts: man-pages-de < 1.7-3
+Conflicts: man-pages-fr < 3.66-3
+
 
 %description
 The procps package contains a set of system utilities that provide
@@ -72,6 +76,7 @@ System and process monitoring utilities development headers
 Summary:  Internationalization pack for procps-ng
 Group:    Applications/System
 Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
 
 %description i18n
 Internationalization pack for procps-ng
@@ -117,11 +122,12 @@ make check
 make DESTDIR=%{buildroot} install
 
 # --localedir doesn't work correctly
-mv %{buildroot}/share/locale %{buildroot}/usr/share
+mv %{buildroot}/share/locale %{buildroot}%{_datadir}
 rmdir %{buildroot}/share
 
 # translated man pages
-find man-po/ -type d -maxdepth 1 -mindepth 1 | while read dirname; do cp -a $dirname %{buildroot}/usr/share/man/ ; done
+find man-po/ -type d -maxdepth 1 -mindepth 1 | while read dirname; do cp -a $dirname %{buildroot}%{_mandir}/ ; done
+rm -f %{buildroot}%{_mandir}/{de,fr,uk}/man1/kill.1
 
 ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
 
@@ -158,6 +164,11 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
 %{_datadir}/locale/*
 
 %changelog
+* Mon Oct 06 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.10-3
+- Resolving file conflicts with man-pages-*
+- Replacing hardcoded paths with macros
+- Making the i18n subpackage noarch
+
 * Tue Sep 30 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.10-2
 - Removing explicit dependency on systemd-libs
 - Removing /etc/sysctl.d (ownership quietly stolen by systemd)