diff --git a/lsof.spec b/lsof.spec index 0d31147..7872a9f 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,6 +1,6 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof -Version: 4.82 +Version: 4.83 Release: 1%{?dist} License: zlib Group: Development/Debuggers @@ -21,8 +21,6 @@ BuildRequires: libselinux-devel # 184338 - allow lsof access nptl threads Patch1: lsof_4.81-threads.patch -# Backport of upstream patch -Patch2: lsof_4.83A-selinux-typo.patch %description Lsof stands for LiSt Open Files, and it does just that: it lists @@ -32,7 +30,6 @@ UNIX system. %prep %setup -q -n %{lsofrh} %patch1 -p1 -%patch2 -p1 %build LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux @@ -56,6 +53,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man*/* %changelog +* Thu Feb 11 2010 Karel Zak 4.83-1 +- upgrade to 4.83 (see the 00DIST file for list of changes) +- remove lsof_4.83A-selinux-typo.patch (fixed upstream) + * Mon Jul 27 2009 Karel Zak 4.82-1 - upgrade to 4.82 (see the 00DIST file for list of changes) - backport an upstream patch from 4.83A-linux diff --git a/lsof_4.83A-selinux-typo.patch b/lsof_4.83A-selinux-typo.patch deleted file mode 100644 index 50e08a6..0000000 --- a/lsof_4.83A-selinux-typo.patch +++ /dev/null @@ -1,16 +0,0 @@ - - Upstream patch, backported from 4.83A-linux. - -- kzak 27-Jul-2009 - -diff -up lsof_4.82-rh/Configure.kzak lsof_4.82-rh/Configure ---- lsof_4.82-rh/Configure.kzak 2009-07-27 09:50:15.000000000 +0200 -+++ lsof_4.82-rh/Configure 2009-07-27 09:50:43.000000000 +0200 -@@ -2700,7 +2700,7 @@ return(0); } - LSOF_TMP1=1 - fi # } - else -- if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "xY" # { -+ if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # { - then - LSOF_TMP1=1 - fi # }