diff --git a/whowatch-configure-c99.patch b/whowatch-configure-c99.patch deleted file mode 100644 index bf7e25a..0000000 --- a/whowatch-configure-c99.patch +++ /dev/null @@ -1,36 +0,0 @@ -Avoid claling the undeclared exit function. Implicit function -declarations were removed from the C language in 1999, and future -compilers will refuse to compile calls to undeclared functions. - -Submitted upstream: - -diff --git a/configure b/configure -index 81d5eb056f2e59d0..4455e5a0211eeb61 100755 ---- a/configure -+++ b/configure -@@ -5354,8 +5354,8 @@ fd_set rfds; - struct timeval tv = {1, 0}; - FD_ZERO(&rfds); FD_SET(0,&rfds); - select(1,&rfds,0,0,&tv); --if(tv.tv_sec == 0) exit(0); --else exit(1); -+if(tv.tv_sec == 0) return 0; -+else return 1; - } - - _ACEOF -diff --git a/configure.ac b/configure.ac -index 64fad6e1023bd541..7be34fd802e608cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -103,8 +103,8 @@ fd_set rfds; - struct timeval tv = {1, 0}; - FD_ZERO(&rfds); FD_SET(0,&rfds); - select(1,&rfds,0,0,&tv); --if(tv.tv_sec == 0) exit(0); --else exit(1); -+if(tv.tv_sec == 0) return 0; -+else return 1; - } - ]])],[AC_MSG_RESULT(yes); AC_DEFINE([RETURN_TV_IN_SELECT],[1],[define if select() modifies the time value])],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)]) - diff --git a/whowatch-gcc15-fixes.patch b/whowatch-gcc15-fixes.patch deleted file mode 100644 index 8ec2e76..0000000 --- a/whowatch-gcc15-fixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur a/src/proctree.h b/src/proctree.h ---- a/src/proctree.h 2018-04-11 07:10:50.000000000 +0100 -+++ b/src/proctree.h 2025-01-25 18:55:39.018468480 +0000 -@@ -19,7 +19,6 @@ - }; - - int update_tree(void del(void*)); --int update_tree(); - struct proc_t* find_by_pid(int pid); - struct proc_t* tree_start(int root, int start); - struct proc_t* tree_next(); -diff -ur a/src/whowatch.c b/src/whowatch.c ---- a/src/whowatch.c 2018-04-11 07:10:50.000000000 +0100 -+++ b/src/whowatch.c 2025-01-25 19:05:36.133313903 +0000 -@@ -222,7 +222,7 @@ - size_changed = 0; - } - --static void winch_handler() -+static void winch_handler(int i) - { - size_changed++; - } -diff -ur a/src/whowatch.h b/src/whowatch.h ---- a/src/whowatch.h 2018-04-11 07:10:50.000000000 +0100 -+++ b/src/whowatch.h 2025-01-25 19:00:56.018861138 +0000 -@@ -164,7 +164,7 @@ - void curses_end(); - - /* proctree.c */ --int update_tree(); -+int update_tree(void del(void*)); - - /* plist.c */ - void delete_tree_line(void *line); diff --git a/whowatch.spec b/whowatch.spec index 66f7024..a70f288 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,15 +1,11 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 23%{?dist} -License: GPL-2.0-only +Release: 12%{?dist} +License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz -Patch0: whowatch-configure-c99.patch - -# Submitted upstream: https://github.com/mtsuszycki/whowatch/pull/13 -Patch1: whowatch-gcc15-fixes.patch BuildRequires: make BuildRequires: gcc @@ -24,12 +20,10 @@ idle time. You can watch processes tree, navigate in it and send INT and KILL signals. %prep -%autosetup -p1 + +%setup -q %build -# Avoid regenerating configure script because whowatch-configure-c99.patch -# updates it directly. -touch aclocal.m4 Makefile.in src/config.h.in %configure %{__make} %{?_smp_mflags} @@ -45,39 +39,6 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.8.6-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.8.6-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.8.6-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 25 2025 Richard Fearn - 1.8.6-20 -- Fix FTBFS (bug #2341538) - -* Sun Jan 19 2025 Fedora Release Engineering - 1.8.6-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.8.6-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.8.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.8.6-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.8.6-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Dec 27 2022 Richard Fearn - 1.8.6-14 -- Use SPDX license identifier - -* Sat Nov 26 2022 Florian Weimer - 1.8.6-13 -- Port configure script to C99 - * Sat Jul 23 2022 Fedora Release Engineering - 1.8.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild