diff --git a/psmisc.spec b/psmisc.spec index 795ca55..6fd3785 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -1,8 +1,3 @@ -%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} -%define WITH_SELINUX 1 -%endif -%define with_pidof 0 - Summary: Utilities for managing processes on your system. Name: psmisc Version: 21.8 @@ -13,9 +8,7 @@ Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz URL: http://psmisc.sourceforge.net Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libtermcap-devel -%if %{WITH_SELINUX} BuildRequires: libselinux-devel -%endif Patch0: psmisc-21.7-fuser-pid.patch Patch1: psmisc-21.7-killall-scanf.patch @@ -35,12 +28,7 @@ of processes that are using specified files or filesystems. %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" -./autogen.sh -%if %{WITH_SELINUX} %configure --prefix=/usr --enable-selinux -%else -%configure --prefix=/usr -%endif make %install @@ -53,9 +41,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/oldfuser $RPM_BUILD_ROOT%{_bindir}/fuser mkdir -p $RPM_BUILD_ROOT/sbin mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT/sbin -%if ! %{with_pidof} rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pidof.1* -%endif %find_lang %name @@ -71,13 +57,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/fuser.1* %{_mandir}/man1/killall.1* %{_mandir}/man1/pstree.1* -%if %{with_pidof} -%{_mandir}/man1/pidof.1* -%endif %changelog * Wed Nov 30 2005 Karel Zak 21.8-1 - fix #174585 - killall crashes on long variable name +- spec file cleanup * Wed Oct 5 2005 Karel Zak 21.7-1.cvs20051005 - sync with upstream CVS