Translated manual pages moved to i18n subpackage

Spec file cleanup

procps-ng.spec

@@ -1,11 +1,10 @@
 # The testsuite is unsuitable for running on buildsystems
 %global tests_enabled 0
-%global manpo_available 0
 
 Summary: System and process monitoring utilities
 Name: procps-ng
 Version: 3.3.15
-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,25 +35,15 @@ Obsoletes: procps < 3.2.9-1
 Provides: /sbin/sysctl
 Provides: /bin/ps
 
-# sysvinit removal in Fedora 21
-Obsoletes: sysvinit-tools < 0:2.89
-Provides: /sbin/pidof
-
-%if %{manpo_available}
-# fortunately the same release number for f21 and f22
-Conflicts: man-pages-de < 1.7-3
-Conflicts: man-pages-fr < 3.66-3
-Conflicts: man-pages-pl < 0.7-5
-%endif
-
 
 %description
 The procps package contains a set of system utilities that provide
 system information. Procps includes ps, free, skill, pkill, pgrep,
-snice, tload, top, uptime, vmstat, w, watch and pwdx. The ps command
+snice, tload, top, uptime, vmstat, pidof, pmap, slabtop, w, watch
-displays a snapshot of running processes. The top command provides
+and pwdx.
-a repetitive update of the statuses of running processes. The free
+The ps command displays a snapshot of running processes. The top command
-command displays the amounts of free and used memory on your
+provides a repetitive update of the statuses of running processes.
+The free command displays the amounts of free and used memory on your
 system. The skill command sends a terminate command (or another
 specified signal) to a specified set of processes. The snice
 command is used to change the scheduling priority of specified
@@ -85,6 +74,11 @@ Group:    Applications/System
 Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 
+# fortunately the same release number for f21 and f22
+Conflicts: man-pages-de < 1.7-3
+Conflicts: man-pages-fr < 3.66-3
+Conflicts: man-pages-pl < 0.7-5
+
 %description i18n
 Internationalization pack for procps-ng
 
@@ -129,7 +123,7 @@ make DESTDIR=%{buildroot} install
 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
 
-%find_lang %{name}
+%find_lang %{name} --all-name --with-man
 
 ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
 
@@ -146,11 +140,6 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
 %{_mandir}/man8/*
 %{_mandir}/man5/*
 
-%if %{manpo_available}
-%{_mandir}/*/man1/*
-%{_mandir}/*/man5/*
-%{_mandir}/*/man8/*
-%endif
 
 %exclude %{_libdir}/libprocps.la
 %exclude /unwanted/*
@@ -166,6 +155,10 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
 %files i18n -f %{name}.lang
 
 %changelog
+* Mon Jul 02 2018 Jan Rybar <jrybar@redhat.com> - 3.3.15-3
+- Translated manual pages moved to i18n subpackage
+- Spec file cleanup
+
 * Thu Jun 14 2018 Jan Rybar <jrybar@redhat.com> - 3.3.15-2
 - General rebuild after commit revert