diff --git a/f42-ftbfs.patch b/f42-ftbfs.patch deleted file mode 100644 index 626bfab..0000000 --- a/f42-ftbfs.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/misc.c b/misc.c -index 9f443ea..a4bb3db 100644 ---- a/misc.c -+++ b/misc.c -@@ -58,7 +58,7 @@ _PROTOTYPE(static void closePipes,(void)); - _PROTOTYPE(static int dolstat,(char *path, char *buf, int len)); - _PROTOTYPE(static int dostat,(char *path, char *buf, int len)); - _PROTOTYPE(static int doreadlink,(char *path, char *buf, int len)); --_PROTOTYPE(static int doinchild,(int (*fn)(), char *fp, char *rbuf, int rbln)); -+_PROTOTYPE(static int doinchild,(int (*fn)(char *, char *, int), char *fp, char *rbuf, int rbln)); - - #if defined(HASINTSIGNAL) - _PROTOTYPE(static int handleint,(int sig)); -@@ -234,7 +234,7 @@ compdev(a1, a2) - - static int - doinchild(fn, fp, rbuf, rbln) -- int (*fn)(); /* function to perform */ -+ int (*fn)(char *, char *, int); /* function to perform */ - char *fp; /* function parameter */ - char *rbuf; /* response buffer */ - int rbln; /* response buffer length */ -@@ -296,7 +296,7 @@ doinchild(fn, fp, rbuf, rbln) - */ - struct stat _; - } r; -- int (*r_fn)(); -+ int (*r_fn)(char *, char *, int); - /* - * Close sufficient open file descriptors except Pipes[0] and - * Pipes[3]. diff --git a/lsof.spec b/lsof.spec index 04379d5..02a8671 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,7 +1,7 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.98.0 -Release: 8%{?dist} +Release: 5%{?dist} License: lsof URL: https://github.com/lsof-org/lsof @@ -17,7 +17,6 @@ Source1: upstream2downstream.sh # BZ#1260300 - move lsof man page to section 1 Patch0: lsof-man-page-section.patch -Patch1: f42-ftbfs.patch BuildRequires: gcc BuildRequires: libselinux-devel @@ -26,14 +25,15 @@ BuildRequires: groff-base BuildRequires: make BuildRequires: automake BuildRequires: autoconf -BuildRequires: git %description Lsof stands for LiSt Open Files, and it does just that: it lists information about files that are open by the processes running on a UNIX system. %prep -%autosetup -n %{lsofrh} -S git +%setup -q -n %{lsofrh} +%autopatch -p1 +#%patch1 -p1 %build %configure @@ -53,15 +53,6 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 4.98.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 24 2025 Jan Rybar - 4.98.0-7 -- FTBFS: stricter check, incompatible types - -* Fri Jan 17 2025 Fedora Release Engineering - 4.98.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Thu Jul 18 2024 Fedora Release Engineering - 4.98.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild