From 86d80c352e6a62078f0f157b6cb487e5b20b9498 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 9 Oct 2008 17:01:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/psmisc?expand=0&rev=13 --- psmisc-22.6-tigetstr.patch | 11 +++++++++++ psmisc.changes | 5 +++++ psmisc.spec | 6 +++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 psmisc-22.6-tigetstr.patch diff --git a/psmisc-22.6-tigetstr.patch b/psmisc-22.6-tigetstr.patch new file mode 100644 index 0000000..3013fe0 --- /dev/null +++ b/psmisc-22.6-tigetstr.patch @@ -0,0 +1,11 @@ +--- src/pstree.c ++++ src/pstree.c 2008-10-09 16:24:23.278874191 +0200 +@@ -861,7 +861,7 @@ main (int argc, char **argv) + } else if (isatty (1) && (termname = getenv ("TERM")) && \ + (strlen (termname) > 0) && \ + (setupterm (NULL, 1 /* stdout */, NULL) == OK) && \ +- (tigetstr ("acsc") > 0)) { ++ ((int)tigetstr ("acsc") > 0)) { + /* + * Failing that, if TERM is defined, a non-null value, and the terminal + * has the VT100 graphics charset, use it. diff --git a/psmisc.changes b/psmisc.changes index 5eba21e..49dfdcf 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 9 16:35:51 CEST 2008 - werner@suse.de + +- Make compiler happy: Don't compare pointer with zero (bnc#432986) + ------------------------------------------------------------------- Wed Oct 1 16:39:27 CEST 2008 - werner@suse.de diff --git a/psmisc.spec b/psmisc.spec index ffc31a8..cc01a7a 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -27,7 +27,7 @@ Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 22.6 -Release: 60 +Release: 61 Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/psmisc-%{version}.tar.bz2 @@ -37,6 +37,7 @@ Patch2: %name-22.6-nfs4fuser.patch Patch3: %name-22.6-netunix.patch Patch4: %name-22.6-writeonly.patch Patch5: %name-22.6-fdleak.patch +Patch6: %name-22.6-tigetstr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 @@ -61,6 +62,7 @@ Authors: %patch3 -p0 -b .netunix %patch4 -p0 -b .wrtonly %patch5 -p0 -b .fdleak +%patch6 -p0 -b .tigetstr %patch0 -p0 %build @@ -103,6 +105,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/pstree.1* %changelog +* Thu Oct 09 2008 werner@suse.de +- Make compiler happy: Don't compare pointer with zero (bnc#432986) * Wed Oct 01 2008 werner@suse.de - Avoid stat(2) for all network based file systems (bnc#409011) * Tue Sep 23 2008 werner@suse.de