From d912675fa7720b33faacaefd3ab93dff50163174 Mon Sep 17 00:00:00 2001 From: Jan Rybar Date: Apr 16 2018 12:27:03 +0000 Subject: Rebase to 3.3.14 Translated man-pages returned --- diff --git a/.gitignore b/.gitignore index 8c9b460..e6e6306 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /procps-ng-3.3.12.tar.xz /procps-ng-3.3.13.tar.xz +/procps-ng-3.3.14.tar.xz diff --git a/procps-ng.spec b/procps-ng.spec index c7b8625..8105231 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -3,8 +3,8 @@ Summary: System and process monitoring utilities Name: procps-ng -Version: 3.3.13 -Release: 2%{?dist} +Version: 3.3.14 +Release: 1%{?dist} License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ Group: Applications/System URL: https://sourceforge.net/projects/procps-ng/ @@ -16,8 +16,6 @@ Source1: README.md # wget https://gitlab.com/procps-ng/procps/raw/e0784ddaed30d095bb1d9a8ad6b5a23d10a212c4/top/README.top Source2: README.top -Patch0: procps-ng-3.3.13-build-fails-due-libio.patch - BuildRequires: ncurses-devel BuildRequires: libtool BuildRequires: autoconf @@ -92,8 +90,6 @@ Internationalization pack for procps-ng cp -p %{SOURCE1} . cp -p %{SOURCE2} top/ -%patch0 -p1 - %build # The following stuff is needed for git archives only #echo "%{version}" > .tarball-version @@ -127,9 +123,8 @@ make check make DESTDIR=%{buildroot} install # translated man pages -# transtations are missing since 3.3.13 because of unspecified and yet untraced error in po4a translation process -#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 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} @@ -148,10 +143,9 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof %{_mandir}/man8/* %{_mandir}/man5/* -# transtations are missing since 3.3.13 because of unspecified and yet untraced error in po4a translation process -# {_mandir}/*/man1/* -# {_mandir}/*/man5/* -# {_mandir}/*/man8/* +%{_mandir}/*/man1/* +%{_mandir}/*/man5/* +%{_mandir}/*/man8/* %exclude %{_libdir}/libprocps.la %exclude /unwanted/* @@ -167,6 +161,10 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof %files i18n -f %{name}.lang %changelog +* Mon Apr 16 2018 Jan Rybar - 3.3.14-1 +- Rebase to 3.3.14 +- Translated man-pages returned + * Thu Apr 05 2018 Jan Rybar - 3.3.13-2 - Build fails due to removal of libio.h from glibc-headers - Translated manpages deactivated since missing from 3.3.13 tarball diff --git a/sources b/sources index 7c76fb2..f8f6abd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (procps-ng-3.3.13.tar.xz) = 9419a54b9875d4e33dd63face5c85cdbef1b8376416d469609128c9370c337a32b9b951c865e53c2ae6cfc8ce8eb7657f724a997cd3206d7af97ddf8a978e008 +SHA512 (procps-ng-3.3.14.tar.xz) = 45617924ae1520765c15d71b76278dc80cac04f5985f83c9b65a8ba379d9a80a2ff0dc14c5a6edee7d6cfa66ce50ec019e8b5203704175ff94547ae6ff2b18c5