[packages/nfdump] - cleanup, removed useless -static, release 2

[qboosh]

commit 31a366431dad0020a250ae9508fbeed5c6504ee0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jan 30 21:38:51 2026 +0100

    - cleanup, removed useless -static, release 2

 nfdump.spec | 67 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)
---
diff --git a/nfdump.spec b/nfdump.spec
index f27dada..31af870 100644
--- a/nfdump.spec
+++ b/nfdump.spec
@@ -1,11 +1,12 @@
-%bcond_without	extra		# build extra utilities used by nfsen
-				# (nfprofile and nftrack)
+#
+# Conditional build:
+%bcond_without	extra		# nfprofile, nftrack utilities (used by nfsen)
 
 Summary:	Netflow processing tools
 Summary(pl.UTF-8):	Narzędzia do przetwarzania ruchu sieciowego
 Name:		nfdump
 Version:	1.7.7
-Release:	1
+Release:	2
 License:	BSD
 Group:		Applications
 Source0:	https://github.com/phaag/nfdump/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -13,13 +14,22 @@ Source0:	https://github.com/phaag/nfdump/archive/v%{version}/%{name}-%{version}.
 Source1:	http://www.ripe.net/ripe/meetings/ripe-50/presentations/ripe50-plenary-tue-nfsen-%{name}.pdf
 # Source1-md5:	6240259f9e54bc78894e99ea1deef776
 URL:		https://github.com/phaag/nfdump
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
 BuildRequires:	bison
+BuildRequires:	bzip2-devel
 BuildRequires:	flex
+# c17
+BuildRequires:	gcc >= 6:7
+BuildRequires:	libpcap-devel
+BuildRequires:	libtool >= 2:2
+BuildRequires:	lz4-devel
 %if %{with extra}
 BuildRequires:	rrdtool-devel
 %endif
+BuildRequires:	zlib-devel >= 1.0.2
+BuildRequires:	zstd-devel
+Requires:	zlib >= 1.0.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,6 +44,7 @@ Narzędzia nfdump zbierają i przetwarzają dane z ruchu sieciowego
 Summary:	Libraries for nfdump
 Summary(pl.UTF-8):	Biblioteki dla nfdump
 Group:		Libraries
+Obsoletes:	nfdump-static < 1.7.7-2
 
 %description libs
 Libraries for nfdump
@@ -41,18 +52,6 @@ Libraries for nfdump
 %description libs -l pl.UTF-8
 Biblioteki dla nfdump
 
-%package static
-Summary:	Static libraries for nfdump
-Summary(pl.UTF-8):	Statyczne biblioteki dla nfdump
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static libraries for nfdump
-
-%description static -l pl.UTF-8
-Statyczne biblioteki dla nfdump
-
 %package extra
 Summary:	Extra utilities for nfdump
 Summary(pl.UTF-8):	Dodatkowe narzędzia dla nfdump
@@ -68,8 +67,13 @@ Dodatkowe narzędzia dla nfdump używane przez nfsen
 %setup -q
 
 %build
-./autogen.sh
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
+	--disable-static \
 %if %{with extra}
 	--enable-nfprofile \
 	--enable-nftrack \
@@ -96,8 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
-%{_sysconfdir}/nfdump.conf
+%doc AUTHORS ChangeLog LICENSE README
 %attr(755,root,root) %{_bindir}/nfanon
 %attr(755,root,root) %{_bindir}/nfcapd
 %attr(755,root,root) %{_bindir}/nfdump
@@ -105,28 +108,24 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/nfpcapd
 %attr(755,root,root) %{_bindir}/nfreplay
 %attr(755,root,root) %{_bindir}/sfcapd
-%{_mandir}/man1/nfanon.*
-%{_mandir}/man1/nfcapd.*
-%{_mandir}/man1/nfdump.*
-%{_mandir}/man1/nfexpire.*
-%{_mandir}/man1/nfpcapd.*
-%{_mandir}/man1/nfreplay.*
-%{_mandir}/man1/sfcapd.*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nfdump.conf
+%{_mandir}/man1/nfanon.1*
+%{_mandir}/man1/nfcapd.1*
+%{_mandir}/man1/nfdump.1*
+%{_mandir}/man1/nfexpire.1*
+%{_mandir}/man1/nfpcapd.1*
+%{_mandir}/man1/nfreplay.1*
+%{_mandir}/man1/sfcapd.1*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnfdump-%{version}.so
-%attr(755,root,root) %{_libdir}/libnffile-%{version}.so
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libnfdump.a
-%{_libdir}/libnffile.a
+%{_libdir}/libnfdump-%{version}.so
+%{_libdir}/libnffile-%{version}.so
 
 %if %{with extra}
 %files extra
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nfprofile
 %attr(755,root,root) %{_bindir}/nftrack
-%{_mandir}/man1/nfprofile.*
+%{_mandir}/man1/nfprofile.1*
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nfdump.git/commitdiff/31a366431dad0020a250ae9508fbeed5c6504ee0