[packages/psmisc] - up to 23.1

arekm arekm at pld-linux.org
Tue Oct 3 11:30:51 CEST 2017


commit 9f7be688898a6d188e0e8008547a813545c9cff8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Oct 3 11:30:45 2017 +0200

    - up to 23.1

 fuser-hang.patch | 12 ------------
 psmisc.spec      | 17 +++++++++--------
 2 files changed, 9 insertions(+), 20 deletions(-)
---
diff --git a/psmisc.spec b/psmisc.spec
index 4caae25..7226187 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -13,16 +13,15 @@ Summary(ru.UTF-8):	Утилиты работы с процессами
 Summary(tr.UTF-8):	/proc dosya sistemi için ps tipi araçlar
 Summary(uk.UTF-8):	Утиліти роботи з процесами
 Name:		psmisc
-Version:	22.21
-Release:	2
+Version:	23.1
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
-Source0:	http://downloads.sourceforge.net/psmisc/%{name}-%{version}.tar.gz
-# Source0-md5:	935c0fd6eb208288262b385fa656f1bf
+Source0:	http://downloads.sourceforge.net/psmisc/%{name}-%{version}.tar.xz
+# Source0-md5:	bbba1f701c02fb50d59540d1ff90d8d1
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	9add7665e440bbd6b0b4f9293ba8b86d
 Patch0:		%{name}-pl.po-update.patch
-Patch1:		fuser-hang.patch
 URL:		http://psmisc.sourceforge.net/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake >= 1:1.10
@@ -89,17 +88,17 @@ göndermek için gerekli programları içerir.
 %prep
 %setup -q
 #%patch0 -p1
-%patch1 -p1
 
 %build
+install -d misc; echo -n '#!/bin/sh\necho -n %{version}' > misc/git-version-gen; chmod +x misc/git-version-gen
 %{__gettextize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 CFLAGS="%{rpmcflags} -D_GNU_SOURCE -I/usr/include/ncurses"
 %configure \
-	--enable-timeout-stat \
+	--enable-timeout-stat=static \
 	%{?with_selinux:--enable-selinux}
 %{__make}
 
@@ -124,11 +123,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/killall
 %attr(755,root,root) %{_bindir}/peekfd
 %attr(755,root,root) %{_bindir}/prtstat
+%attr(755,root,root) %{_bindir}/pslog
 %attr(755,root,root) %{_bindir}/pstree
 %attr(755,root,root) %{_bindir}/pstree.x11
 %{_mandir}/man1/fuser.1*
 %{_mandir}/man1/killall.1*
 %{_mandir}/man1/peekfd.1*
+%{_mandir}/man1/pslog.1*
 %{_mandir}/man1/prtstat.1*
 %{_mandir}/man1/pstree.1*
 %lang(fi) %{_mandir}/fi/man1/*
diff --git a/fuser-hang.patch b/fuser-hang.patch
deleted file mode 100644
index 29b5e99..0000000
--- a/fuser-hang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur psmisc-22.21.orig/src/fuser.c psmisc-22.21/src/fuser.c
---- psmisc-22.21.orig/src/fuser.c	2014-01-31 14:07:32.000000000 +0100
-+++ psmisc-22.21/src/fuser.c	2016-04-22 14:59:25.000000000 +0200
-@@ -1871,7 +1871,7 @@
- 				len = write(pipes[1], buf, sizeof(struct stat));
- 			while (len < 0 && errno == EINTR);
- 		close(pipes[1]);
--		exit(ret);
-+		_exit(ret);
- 	default:
- 		close(pipes[1]);
- 		if (sigsetjmp(jenv, 1)) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/psmisc.git/commitdiff/9f7be688898a6d188e0e8008547a813545c9cff8



More information about the pld-cvs-commit mailing list