From cf1a2ddbbc00217063f16290469440cee596c115 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 10:53:39 +0000 Subject: [PATCH] auto-import changelog data from psmisc-21.4-2.src.rpm Mon Mar 15 2004 Mike A. Harris 21.4-2 - Re-enabled SELINUX support - Removed gcc33 patch, no longer needed it seems. Mon Mar 15 2004 Mike A. Harris 21.4-1 - Updated to new upstream version 21.4 - Ported SELinux patch forward as psmisc-21.4-redhat-selinux-psmisc.patch, but disabled SELINUX support temporarily until other build problems are resolved - Remove MKINSTALLDIRS-./mkinstalldirs from "make install" as that causes the build to fail when "./" changes. If this option is ever added back, make it relative to $RPM_BUILD_DIR instead of ./ so that things do not break - Added pstree.x11 to file list after rpm reported it present in buildroot but not packaged Fri Feb 13 2004 Elliot Lee 21.3-8 - rebuilt --- .cvsignore | 2 +- psmisc.spec | 35 ++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4798ff1..7b0cba7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -psmisc-21.3.tar.gz +psmisc-21.4.tar.gz diff --git a/psmisc.spec b/psmisc.spec index 80180c5..a6a22da 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -5,14 +5,13 @@ Summary: Utilities for managing processes on your system. Name: psmisc -Version: 21.3 -Release: 7 +Version: 21.4 +Release: 2 License: BSD/GPL Group: Applications/System Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz Patch0: psmisc-20.2-56186.patch -Patch1: psmisc-21.2-gcc33.patch -Patch2: psmisc-selinux.patch +Patch2: psmisc-21.4-redhat-selinux-psmisc.patch URL: http://psmisc.sourceforge.net Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libtermcap-devel @@ -29,16 +28,14 @@ of processes that are using specified files or filesystems. %setup -q %patch0 -p1 -b .56186 %if %{WITH_SELINUX} -#SELinux -%patch2 -p1 -b .selinux +%patch2 -p1 -b .redhat-selinux-psmisc %endif -#%patch1 -p1 -b .gcc33 %build perl -pi -e "s,^CFLAGS =,CFLAGS = $RPM_OPT_FLAGS -D_GNU_SOURCE,g" */Makefile.* -# Is --prefix actually necessary here? I think it's redundant... test later... +# FIXME: Is --prefix actually necessary here? I think it's redundant... test later... %if %{WITH_SELINUX} %configure --prefix=/usr --enable-selinux %else @@ -48,8 +45,9 @@ make %install rm -rf $RPM_BUILD_ROOT +# The rpm makeinstall macro breaks the build, so we do it the old way +make install DESTDIR="$RPM_BUILD_ROOT" -make install DESTDIR="$RPM_BUILD_ROOT" MKINSTALLDIRS=./mkinstalldirs mkdir -p $RPM_BUILD_ROOT/sbin mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT/sbin %if ! %{with_pidof} @@ -66,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT /sbin/fuser %{_bindir}/killall %{_bindir}/pstree +%{_bindir}/pstree.x11 %{_mandir}/man1/fuser.1* %{_mandir}/man1/killall.1* %{_mandir}/man1/pstree.1* @@ -74,6 +73,24 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Mar 15 2004 Mike A. Harris 21.4-2 +- Re-enabled SELINUX support +- Removed gcc33 patch, no longer needed it seems. + +* Sun Mar 15 2004 Mike A. Harris 21.4-1 +- Updated to new upstream version 21.4 +- Ported SELinux patch forward as psmisc-21.4-redhat-selinux-psmisc.patch, + but disabled SELINUX support temporarily until other build problems are + resolved +- Remove MKINSTALLDIRS-./mkinstalldirs from "make install" as that causes the + build to fail when "./" changes. If this option is ever added back, make + it relative to $RPM_BUILD_DIR instead of ./ so that things do not break +- Added pstree.x11 to file list after rpm reported it present in buildroot but + not packaged + +* Fri Feb 13 2004 Elliot Lee 21.3-8 +- rebuilt + * Mon Jan 26 2004 Dan Walsh 21.3-7 - fix is_selinux_enabled call diff --git a/sources b/sources index ef360e6..7432018 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df5aef7438a00d4f41bc0c5e91e4ec7d psmisc-21.3.tar.gz +8449269fdc8ae5d7d494df745e1180d3 psmisc-21.4.tar.gz