From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 10 Apr 2019 10:59:15 +0000 (+0200)
Subject: distro/rpm: create knot-resolver-module-http package
X-Git-Tag: v4.0.0~1^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f229647d6efedbed87d5a4214ef04696a2d43e40;p=thirdparty%2Fknot-resolver.git

distro/rpm: create knot-resolver-module-http package
---

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index b9f963002..3532c1645 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -56,7 +56,7 @@ BuildRequires:  lmdb-devel
 Requires:       lua-socket
 Requires:       lua-sec
 Requires:       lua-filesystem
-Requires(pre):	shadow-utils
+Requires(pre):  shadow-utils
 %endif
 %if 0%{?fedora}
 BuildRequires:  pkgconfig(lmdb)
@@ -65,7 +65,7 @@ Requires:       lua-cqueues-compat
 Requires:       lua-filesystem-compat
 Requires:       lua-socket-compat
 Requires:       lua-sec-compat
-Requires(pre):	shadow-utils
+Requires(pre):  shadow-utils
 %endif
 %if 0%{?suse_version}
 %define NINJA ninja
@@ -74,7 +74,7 @@ BuildRequires:  python3-Sphinx
 Requires:       lua51-luafilesystem
 Requires:       lua51-luasocket
 Requires:       lua51-luasec
-Requires(pre):	shadow
+Requires(pre):  shadow
 %endif
 
 %if "x%{?rhel}" == "x"
@@ -112,6 +112,23 @@ Requires:       %{name} = %{version}-%{release}
 Documentation for Knot Resolver
 %endif
 
+%if "x%{?suse_version}" == "x"
+%package module-http
+Summary:        HTTP/2 module for Knot Resolver
+%if 0%{?fedora}
+Requires:       compat-lua-http
+Requires:       compat-lua-mmdb
+%else
+Requires:       lua-http
+Requires:       lua-mmdb
+%endif
+
+%description module-http
+HTTP/2 module for Knot Resolver has multiple uses. It enables use of
+DNS-over-HTTP, can serve as API ednpoint for other modules or provide a web
+interface for local visualization of the resolver cache and queries.
+%endif
+
 %prep
 %if 0%{GPG_CHECK}
 export GNUPGHOME=./gpg-keyring
@@ -161,10 +178,11 @@ install -m 0750 -d %{buildroot}/run/%{name}
 
 # remove modules with missing dependencies
 rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/etcd.lua
+%if 0%{?suse_version}
 rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/http
-rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/http.lua
-rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/http_trace.lua
+rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/http*.lua
 rm %{buildroot}%{_libdir}/knot-resolver/kres_modules/prometheus.lua
+%endif
 
 # rename doc directory for centos, opensuse
 %if "x%{?fedora}" == "x"
@@ -223,7 +241,30 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 %{_sbindir}/kresd
 %{_sbindir}/kresc
 %{_libdir}/libkres.so.*
-%{_libdir}/knot-resolver
+%dir %{_libdir}/knot-resolver
+%{_libdir}/knot-resolver/*.so
+%{_libdir}/knot-resolver/*.lua
+%dir %{_libdir}/knot-resolver/kres_modules
+%{_libdir}/knot-resolver/kres_modules/*.so
+%{_libdir}/knot-resolver/kres_modules/daf
+%{_libdir}/knot-resolver/kres_modules/daf.lua
+%{_libdir}/knot-resolver/kres_modules/detect_time_jump.lua
+%{_libdir}/knot-resolver/kres_modules/detect_time_skew.lua
+%{_libdir}/knot-resolver/kres_modules/dns64.lua
+%{_libdir}/knot-resolver/kres_modules/experimental_dot_auth.lua
+%{_libdir}/knot-resolver/kres_modules/graphite.lua
+%{_libdir}/knot-resolver/kres_modules/policy.lua
+%{_libdir}/knot-resolver/kres_modules/predict.lua
+%{_libdir}/knot-resolver/kres_modules/prefill.lua
+%{_libdir}/knot-resolver/kres_modules/priming.lua
+%{_libdir}/knot-resolver/kres_modules/rebinding.lua
+%{_libdir}/knot-resolver/kres_modules/renumber.lua
+%{_libdir}/knot-resolver/kres_modules/serve_stale.lua
+%{_libdir}/knot-resolver/kres_modules/ta_sentinel.lua
+%{_libdir}/knot-resolver/kres_modules/ta_signal_query.lua
+%{_libdir}/knot-resolver/kres_modules/ta_update.lua
+%{_libdir}/knot-resolver/kres_modules/view.lua
+%{_libdir}/knot-resolver/kres_modules/workarounds.lua
 %{_mandir}/man8/kresd.8.gz
 
 %files devel
@@ -237,6 +278,13 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 %doc %{_pkgdocdir}/html
 %endif
 
+%if "x%{?suse_version}" == "x"
+%files module-http
+%{_libdir}/knot-resolver/kres_modules/http
+%{_libdir}/knot-resolver/kres_modules/http*.lua
+%{_libdir}/knot-resolver/kres_modules/prometheus.lua
+%endif
+
 %changelog
 * Fri Feb 16 2018 Tomas Krizek <tomas.krizek@nic.cz> - 2.1.0-1
 - see NEWS or https://www.knot-resolver.cz/