[packages/dropwatch] - updated to 1.5.3 - dropped outdated np-Werror patch (-Werror is still used, but now doesn't break
qboosh
qboosh at pld-linux.org
Sat Jul 25 20:50:02 CEST 2020
commit 5a19907b62678c8b11015eb1508d7ae2fdcdc869
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jul 25 20:51:45 2020 +0200
- updated to 1.5.3
- dropped outdated np-Werror patch (-Werror is still used, but now doesn't break build)
dropwatch.spec | 44 +++++++++++++++++++++-----------------------
np-Werror.patch | 9 ---------
2 files changed, 21 insertions(+), 32 deletions(-)
---
diff --git a/dropwatch.spec b/dropwatch.spec
index acb2968..be85d21 100644
--- a/dropwatch.spec
+++ b/dropwatch.spec
@@ -1,19 +1,18 @@
Summary: Kernel dropped packet monitor
Summary(pl.UTF-8): Monitor pakietów odrzuconych przez jądro
Name: dropwatch
-Version: 1.4
-Release: 19
+Version: 1.5.3
+Release: 1
License: GPL v2+
Group: Applications/System
-Source0: https://fedorahosted.org/releases/d/r/dropwatch/%{name}-%{version}.tbz2
-# Source0-md5: 5145753b3e9255bd9b190251ba4d3bbf
-Patch0: np-Werror.patch
-# dead
-#URL: https://fedorahosted.org/dropwatch
-# is it "main" fork?
-URL: https://github.com/garekkream/dropwatch
+Source0: https://github.com/nhorman/dropwatch/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 64527bb669393e45b9b21f0b91c574c0
+URL: https://github.com/nhorman/dropwatch
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
BuildRequires: binutils-devel
BuildRequires: libnl-devel >= 3.2
+BuildRequires: libpcap-devel
BuildRequires: linux-libc-headers
BuildRequires: pkgconfig
BuildRequires: readline-devel
@@ -30,30 +29,29 @@ odrzuconych pakietów sieciowych.
%prep
%setup -q
-%patch0 -p1
-
-cd src
-%{__sed} -i -e 's,gcc,$(CC),g' Makefile
-%{__sed} -i -e '/^CFLAGS/ s/$/ $(EXTRA_CFLAGS)/' Makefile
-%{__sed} -i -e '/^LDFLAGS/ s/$/ $(EXTRA_LDFLAGS)/' Makefile
%build
-%{__make} -C src \
- CC="%{__cc}" \
- EXTRA_CFLAGS="%{rpmcflags}" \
- EXTRA_LDFLAGS="%{rpmldflags}"
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-install -p src/dropwatch $RPM_BUILD_ROOT%{_bindir}
-cp -p doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README
+%doc README.md
%attr(755,root,root) %{_bindir}/dropwatch
+%attr(755,root,root) %{_bindir}/dwdump
%{_mandir}/man1/dropwatch.1*
diff --git a/np-Werror.patch b/np-Werror.patch
deleted file mode 100644
index 075506b..0000000
--- a/np-Werror.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- dropwatch-1.4/src/Makefile~ 2016-04-01 17:36:46.000000000 +0900
-+++ dropwatch-1.4/src/Makefile 2016-04-01 17:42:02.414711018 +0900
-@@ -1,5 +1,5 @@
- all: dropwatch
--CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0`
-+CFLAGS+=-c -g -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0`
- LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3
- OBJFILES := main.o lookup.o\
- lookup_bfd.o lookup_kas.o
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dropwatch.git/commitdiff/5a19907b62678c8b11015eb1508d7ae2fdcdc869
More information about the pld-cvs-commit
mailing list