rpms/procps-ng
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to 3.3.13

Browse Source 
Build fails due to removal of libio.h from glibc-headers
Translated manpages deactivated since missing from 3.3.13 tarball
This commit is contained in:
Jan Rybar 2018-04-09 19:24:42 +02:00
parent 7e6f622b67
commit d6723eaca5
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/procps-ng-3.3.12.tar.xz
/procps-ng-3.3.13.tar.xz

25
procps-ng.spec
View File

@ -3,7 +3,7 @@
Summary: System and process monitoring utilities
Name: procps-ng
Version: 3.3.12
Version: 3.3.13
Release: 2%{?dist}
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
Group: Applications/System
@ -16,7 +16,7 @@ Source1: README.md
# wget https://gitlab.com/procps-ng/procps/raw/e0784ddaed30d095bb1d9a8ad6b5a23d10a212c4/top/README.top
Source2: README.top
Patch0: procps-ng-3.3.12-ps-luid-format-option.patch
Patch0: procps-ng-3.3.13-build-fails-due-libio.patch
BuildRequires: ncurses-devel
BuildRequires: libtool
@ -44,6 +44,7 @@ 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
Conflicts: man-pages-pl < 0.7-5
%description
@ -93,7 +94,6 @@ cp -p %{SOURCE2} top/
%patch0 -p1
%build
# The following stuff is needed for git archives only
#echo "%{version}" > .tarball-version
@ -127,8 +127,9 @@ make check
make DESTDIR=%{buildroot} install
# translated man pages
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
# 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_lang %{name}
@ -146,8 +147,11 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
%{_mandir}/man1/*
%{_mandir}/man8/*
%{_mandir}/man5/*
%{_mandir}/*/man1/*
%{_mandir}/*/man8/*
# transtations are missing since 3.3.13 because of unspecified and yet untraced error in po4a translation process
# {_mandir}/*/man1/*
# {_mandir}/*/man5/*
# {_mandir}/*/man8/*
%exclude %{_libdir}/libprocps.la
%exclude /unwanted/*
@ -163,6 +167,13 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
%files i18n -f %{name}.lang
%changelog
* Thu Apr 05 2018 Jan Rybar <jrybar@redhat.com> - 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
* Tue Apr 03 2018 Jan Rybar <jrybar@redhat.com> - 3.3.13-1
- Rebase to 3.3.13
* Mon Feb 26 2018 Jan Rybar <jrybar@redhat.com> - 3.3.12-2
- ps: LUID (LoginID) format option available

2
sources
View File

@ -1 +1 @@
SHA512 (procps-ng-3.3.12.tar.xz) = ea816740ff72cc53d99b5d2e78a511b627ea5b295e0efff67605c56d1ab075abc6b0e2da3df4facbfe903fc9d679e892d351b6884a966d37c6f4bfd9141a924b
SHA512 (procps-ng-3.3.13.tar.xz) = 9419a54b9875d4e33dd63face5c85cdbef1b8376416d469609128c9370c337a32b9b951c865e53c2ae6cfc8ce8eb7657f724a997cd3206d7af97ddf8a978e008