From: Jakub Ružička <jakub.ruzicka@nic.cz>
Date: Mon, 11 Jan 2021 13:17:02 +0000 (+0000)
Subject: distro/rpm: move dnstap to subpackage
X-Git-Tag: v3.1.0~261^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e8dd2f47fa6dde102b4d511e1681e13ec8078cf;p=thirdparty%2Fknot-dns.git

distro/rpm: move dnstap to subpackage
---

diff --git a/distro/rpm/knot.spec b/distro/rpm/knot.spec
index c13eb1070a..74f12de659 100644
--- a/distro/rpm/knot.spec
+++ b/distro/rpm/knot.spec
@@ -3,6 +3,7 @@
 
 %define GPG_CHECK 0
 %define VERSION __VERSION__
+%define BASE_VERSION %(echo %{version} | sed 's/^\([^.]\+\.[^.]\+\).*/\1/')
 %define repodir %{_builddir}/%{name}-%{version}
 
 Summary:	High-performance authoritative DNS server
@@ -33,13 +34,14 @@ BuildRequires:	pkgconfig(libedit)
 
 # Optional dependencies
 BuildRequires:	pkgconfig(libcap-ng)
-BuildRequires:	pkgconfig(libfstrm)
 BuildRequires:	pkgconfig(libidn2)
 BuildRequires:	pkgconfig(libmaxminddb)
 BuildRequires:	pkgconfig(libnghttp2)
-BuildRequires:	pkgconfig(libprotobuf-c)
 BuildRequires:	pkgconfig(libsystemd)
 BuildRequires:	pkgconfig(systemd)
+# dnstap dependencies
+BuildRequires:	pkgconfig(libfstrm)
+BuildRequires:	pkgconfig(libprotobuf-c)
 
 # Distro-dependent dependencies
 %if 0%{?suse_version}
@@ -98,6 +100,13 @@ Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 %description utils
 The package contains DNS client utilities shipped with the Knot DNS server.
 
+%package module-dnstap
+Summary:	dnstap module for Knot DNS
+Requires:	%{name} = %{version}-%{release}
+
+%description module-dnstap
+The package contains dnstap Knot DNS module for logging DNS traffic.
+
 %package doc
 Summary:	Documentation for the Knot DNS server
 BuildArch:	noarch
@@ -133,12 +142,13 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused"
   --localstatedir=/var/lib \
   --libexecdir=/usr/lib/knot \
   --with-rundir=/run/knot \
+  --with-moduledir=%{_libdir}/knot/modules-%{BASE_VERSION} \
   --with-storage=/var/lib/knot \
   %{?configure_db_sizes} \
   %{?configure_xdp} \
   --disable-static \
   --enable-dnstap=yes \
-  --with-module-dnstap=yes
+  --with-module-dnstap=shared
 make %{?_smp_mflags}
 make html
 
@@ -255,6 +265,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || :
 %{_mandir}/man1/knsec3hash.*
 %{_mandir}/man1/knsupdate.*
 
+%files module-dnstap
+%{_libdir}/knot/modules-*/dnstap.so
+
 %files libs
 %license COPYING
 %doc NEWS