update to upstrem cvs version
This commit is contained in:
parent
40687e9825
commit
dc901bd5db
@ -1 +1 @@
|
|||||||
psmisc-21.6.tar.gz
|
psmisc-21.7.tar.gz
|
||||||
|
32
psmisc.spec
32
psmisc.spec
@ -5,14 +5,11 @@
|
|||||||
|
|
||||||
Summary: Utilities for managing processes on your system.
|
Summary: Utilities for managing processes on your system.
|
||||||
Name: psmisc
|
Name: psmisc
|
||||||
Version: 21.6
|
Version: 21.7
|
||||||
Release: 1
|
Release: 1.cvs20051005
|
||||||
License: BSD/GPL
|
License: BSD/GPL
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
|
Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
|
||||||
Patch0: psmisc-20.2-56186.patch
|
|
||||||
Patch1: psmisc-21.6-selinux.patch
|
|
||||||
Patch2: psmisc-21.6-fuser-pid.patch
|
|
||||||
URL: http://psmisc.sourceforge.net
|
URL: http://psmisc.sourceforge.net
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||||
BuildRequires: libtermcap-devel
|
BuildRequires: libtermcap-devel
|
||||||
@ -20,6 +17,8 @@ BuildRequires: libtermcap-devel
|
|||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Patch0: psmisc-21.7-fuser-pid.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The psmisc package contains utilities for managing processes on your
|
The psmisc package contains utilities for managing processes on your
|
||||||
system: pstree, killall and fuser. The pstree command displays a tree
|
system: pstree, killall and fuser. The pstree command displays a tree
|
||||||
@ -30,21 +29,11 @@ of processes that are using specified files or filesystems.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .56186
|
%patch0 -p1 -b .pid
|
||||||
|
|
||||||
%if %{WITH_SELINUX}
|
|
||||||
%patch1 -p1 -b .selinux
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%patch2 -p1 -b .pid
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
aclocal
|
|
||||||
automake -a
|
|
||||||
autoconf
|
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
|
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
|
||||||
|
./autogen.sh
|
||||||
# FIXME: Is --prefix actually necessary here? I think it's redundant... test later...
|
|
||||||
%if %{WITH_SELINUX}
|
%if %{WITH_SELINUX}
|
||||||
%configure --prefix=/usr --enable-selinux
|
%configure --prefix=/usr --enable-selinux
|
||||||
%else
|
%else
|
||||||
@ -57,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
# The rpm makeinstall macro breaks the build, so we do it the old way
|
# 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"
|
||||||
|
|
||||||
|
# install more stable old version of fuser
|
||||||
|
mv $RPM_BUILD_ROOT%{_bindir}/oldfuser $RPM_BUILD_ROOT%{_bindir}/fuser
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/sbin
|
mkdir -p $RPM_BUILD_ROOT/sbin
|
||||||
mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT/sbin
|
mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT/sbin
|
||||||
%if ! %{with_pidof}
|
%if ! %{with_pidof}
|
||||||
@ -82,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 5 2005 Karel Zak <kzak@redhat.com> 21.7-1.cvs20051005
|
||||||
|
- sync with upstream CVS
|
||||||
|
- use old version of fuser
|
||||||
|
|
||||||
* Thu Sep 8 2005 Karel Zak <kzak@redhat.com> 21.6-1
|
* Thu Sep 8 2005 Karel Zak <kzak@redhat.com> 21.6-1
|
||||||
- sync with upstream release 21.6
|
- sync with upstream release 21.6
|
||||||
- cleanup selinux patch
|
- cleanup selinux patch
|
||||||
@ -186,7 +182,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
- Autogenerate the signal list from %{_includedir}/bits/signum.h
|
- Autogenerate the signal list from %{_includedir}/bits/signum.h
|
||||||
to make sure it works on all arches and doesn't break again.
|
to make sure it works on all arches and doesn't break again.
|
||||||
|
|
||||||
* Wed May 8 2002 Trond Eivind Glomsrød <teg@redhat.com> 20.2-3
|
* Wed May 8 2002 Trond Eivind Glomsrod <teg@redhat.com> 20.2-3
|
||||||
- Fix the signal list
|
- Fix the signal list
|
||||||
- Don't strip when linking
|
- Don't strip when linking
|
||||||
- Use a %%{_tmppath}
|
- Use a %%{_tmppath}
|
||||||
|
Loading…
Reference in New Issue
Block a user