Install new command dwdump

- Install new command dwdump
- Update obsoleted m4 macros
- Update Makefile license
- Update spec file

dropwatch-Fix-license-specifiers.patch

@@ -0,0 +1,91 @@
+From ab2965faeeb63fb22b938cc4c80a417b3bf7716b Mon Sep 17 00:00:00 2001
+From: Neil Horman <nhorman@gmail.com>
+Date: Wed, 7 Jul 2021 08:36:48 -0400
+Subject: [PATCH] Fix license specifiers
+
+It was noted that there was an LGPL license in a makefile, which is
+rather non-sensical in my mind, and clearly erroneous.  So lets fix up
+the other build files to match the spdx header in the source code
+
+Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
+---
+ Makefile.am     | 19 +------------------
+ autogen.sh      |  2 ++
+ configure.ac    |  2 ++
+ doc/Makefile.am |  1 +
+ src/Makefile.am |  3 ++-
+ 5 files changed, 8 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index fb2cfd6..dba20d4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,24 +1,7 @@
+ # Makefile.am --
+ # Copyright 2018 Neil Horman
+ # All Rights Reserved.
+-#
+-# This library is free software; you can redistribute it and/or
+-# modify it under the terms of the GNU Lesser General Public
+-# License as published by the Free Software Foundation; either
+-# version 2.1 of the License, or (at your option) any later version.
+-#
+-# This library is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# Lesser General Public License for more details.
+-#
+-# You should have received a copy of the GNU Lesser General Public
+-# License along with this library; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-#
+-# Authors:
+-#   Steve Grubb <sgrubb@redhat.com>
+-# 
++# SPDX-License-Identifier: GPL-2.0-or-later
+ 
+ AUTOMAKE_OPTIONS = no-dependencies
+ ACLOCAL_AMFLAGS = -I m4
+diff --git a/autogen.sh b/autogen.sh
+index b792e8b..35a8644 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -1,4 +1,6 @@
+ #! /bin/sh
++# SPDX-License-Identifier: GPL-2.0-or-later
++
+ set -x -e
+ mkdir -p m4
+ # --no-recursive is available only in recent autoconf versions
+diff --git a/configure.ac b/configure.ac
+index 3671f27..3b51fb2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,3 +1,5 @@
++# SPDX-License-Identifier: GPL-2.0-or-later
++
+ AC_INIT(dropwatch,1.5.3)
+ AC_PREREQ(2.12)dnl
+ AC_CONFIG_HEADERS(config.h)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 3d61286..76da64e 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,2 +1,3 @@
++# SPDX-License-Identifier: GPL-2.0-or-later
+ dist_man_MANS = dropwatch.1 dwdump.1
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f56a39d..1fd6c33 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,5 @@
+-
++# SPDX-License-Identifier: GPL-2.0-or-later
++#
+ bin_PROGRAMS = dropwatch dwdump
+ 
+ AM_CFLAGS = -g -Wall -Werror $(LIBNL3_CFLAGS) $(READLINE_CFLAGS)
+-- 
+2.31.1
+

dropwatch-configure-update-obsoleted-m4-macros.patch

@@ -0,0 +1,36 @@
+From 6259779e26c928d59b7aae66273da095fcfcb49b Mon Sep 17 00:00:00 2001
+From: Hangbin Liu <liuhangbin@gmail.com>
+Date: Tue, 6 Jul 2021 19:11:43 +0800
+Subject: [PATCH] configure: update obsoleted m4 macros
+
+Replace obsoleted AM_CONFIG_HEADER[1] with AC_CONFIG_HEADERS.
+Also replace deprecated AM_PROG_LIBTOOL[2] with LT_INIT.
+
+[1] https://www.gnu.org/software/automake/manual/html_node/Optional.html
+[2] https://www.gnu.org/software/libtool/manual/html_node/LT_005fINIT.html
+
+Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2a840cc..3671f27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,10 +1,10 @@
+ AC_INIT(dropwatch,1.5.3)
+ AC_PREREQ(2.12)dnl
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([foreign] [subdir-objects])
+-AM_PROG_LIBTOOL
++LT_INIT
+ AC_SUBST(LIBTOOL_DEPS)
+ 
+ AC_PROG_CC
+-- 
+2.31.1
+

dropwatch-install-dwdump-manpage.patch

@@ -0,0 +1,17 @@
+From a6a152f111766afefcdf3a3ba271cdeb3f387553 Mon Sep 17 00:00:00 2001
+From: Sebastian Wiesinger <sebastian@karotte.org>
+Date: Wed, 13 Jan 2021 12:30:06 +0100
+Subject: [PATCH] Install manpage for dwdump
+
+---
+ doc/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 6ff1152..3d61286 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,2 +1,2 @@
+-dist_man_MANS = dropwatch.1
++dist_man_MANS = dropwatch.1 dwdump.1
+ 

dropwatch.spec

@@ -1,46 +1,61 @@
-Summary: Kernel dropped packet monitor 
-Name: dropwatch 
+Name: dropwatch
 Version: 1.5.3
-Release: 4%{?dist}
-Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz
-Patch0: %{name}-gcc11.patch
-URL: https://github.com/nhorman/dropwatch 
-License: GPLv2+ 
-BuildRequires: kernel-headers readline-devel
-BuildRequires: binutils-devel libnl3-devel pkgconfig
-BuildRequires: autoconf automake libtool libpcap-devel
-BuildRequires: make
-Requires: libnl3, readline
+Release: 5%{?dist}
+Summary: Kernel dropped packet monitor
 
+License: GPLv2+
+URL: https://github.com/nhorman/dropwatch
+Source0: https://github.com/nhorman/dropwatch/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0: %{name}-gcc11.patch
+Patch1: %{name}-install-dwdump-manpage.patch
+Patch2: %{name}-configure-update-obsoleted-m4-macros.patch
+Patch3: %{name}-Fix-license-specifiers.patch
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gcc
+BuildRequires: make
+BuildRequires: pkgconfig
+BuildRequires: libtool
+BuildRequires: kernel-headers
+BuildRequires: binutils-devel
+BuildRequires: libnl3-devel
+BuildRequires: libpcap-devel
+BuildRequires: readline-devel
+
+Requires: libnl3
+Requires: readline
 
 %description
 dropwatch is an utility to interface to the kernel to monitor for dropped
 network packets.
 
 %prep
-%setup 
-%patch0 -p1
+%autosetup -p1
 
 %build
 ./autogen.sh
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m0755 src/dropwatch $RPM_BUILD_ROOT%{_bindir}
-install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
+%{make_install}
 
 %files
-%{_bindir}/*
-%{_mandir}/man1/*
+%{_bindir}/dropwatch
+%{_bindir}/dwdump
+%{_mandir}/man1/dropwatch.1*
+%{_mandir}/man1/dwdump.1*
 %doc README.md
-%doc COPYING
+%license COPYING
 
 %changelog
+* Mon Jul 12 2021 Hangbin Liu <haliu@redhat.com> - 1.5.3-5
+- Update spec file
+- Update Makefile license
+- Update obsoleted m4 macros
+- Install new command dwdump
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild