pkg: doc and its deps removed

diff --git a/distro/pkg/deb/clean b/distro/pkg/deb/clean
index 3c2f3ba30e17f355ec23edfa4e5ecb3d016c66af..574b40f8a5ded9eb833112792e09b198a8ba6488 100644 (file)
--- a/distro/pkg/deb/clean
+++ b/distro/pkg/deb/clean
@@ -1,3 +1 @@
 build_deb/
-doc/doxyxml/
-doc/html/

diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index 754e2674f5e4a805f2456c8d3abd15dcc52bf910..6aaaa074d13fcedf66e197851c6c54667a0614b6 100644 (file)
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -22,14 +22,9 @@ Build-Depends:
  luajit,
  pkg-config,
  meson (>= 0.49),
- doxygen,
  protobuf-c-compiler,
  python3-all,
- python3-breathe,
  python3-setuptools,
- python3-sphinx,
- python3-sphinx-rtd-theme,
- texinfo,
  libssl-dev,
 Homepage: https://www.knot-resolver.cz/
 
@@ -126,23 +121,6 @@ Description: HTTP module for Knot Resolver
  This package contains HTTP/2 module for local visualization of the
  resolver cache and queries.
 
-Package: knot-resolver-doc
-Architecture: all
-Section: doc
-Depends:
- libjs-jquery,
- libjs-underscore,
- ${misc:Depends},
-Description: Documentation for Knot Resolver
- The Knot Resolver is a caching full resolver implementation
- written in C and LuaJIT, including both a resolver library and a
- daemon. Modular architecture of the library keeps the core tiny and
- efficient, and provides a state-machine like API for
- extensions. There are three built-in modules - iterator, cache,
- validator, and many external.
- .
- This package contains Knot Resolver Documentation.
-
 Package: python3-knot-resolver-manager
 Architecture: all
 Provides: knot-resolver-manager

diff --git a/distro/pkg/deb/knot-resolver-doc.doc-base b/distro/pkg/deb/knot-resolver-doc.doc-base
deleted file mode 100644 (file)
index 9cd0fdf..0000000
--- a/distro/pkg/deb/knot-resolver-doc.doc-base
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: knot-resolver
-Title: Knot Resolver documentation
-Author: CZ.NIC labs
-Abstract: Documentation for the Knot Resolver,
- including building from source, using the library,
- and configuration and operation of the daemon.
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/knot-resolver/html/index.html
-Files: /usr/share/doc/knot-resolver/html/*.html

diff --git a/distro/pkg/deb/knot-resolver-doc.docs b/distro/pkg/deb/knot-resolver-doc.docs
deleted file mode 100644 (file)
index baa81f7..0000000
--- a/distro/pkg/deb/knot-resolver-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/knot-resolver/html/*

diff --git a/distro/pkg/deb/knot-resolver-doc.info b/distro/pkg/deb/knot-resolver-doc.info
deleted file mode 100644 (file)
index 2283d88..0000000
--- a/distro/pkg/deb/knot-resolver-doc.info
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/info/knot-resolver.info
-debian/tmp/usr/share/info/knot-resolver-figures/*

diff --git a/distro/pkg/deb/knot-resolver-doc.links b/distro/pkg/deb/knot-resolver-doc.links
deleted file mode 100644 (file)
index 25e9584..0000000
--- a/distro/pkg/deb/knot-resolver-doc.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/javascript/jquery/jquery.min.js usr/share/doc/knot-resolver/html/_static/jquery.js
-usr/share/javascript/underscore/underscore.min.js usr/share/doc/knot-resolver/html/_static/underscore.js

diff --git a/distro/pkg/deb/not-installed b/distro/pkg/deb/not-installed
index f527e79f4fadf8b67ce9d3392f4376a250ffe06e..ceb8f20dda56ffc9b375abb3138bfe040d5a9dfa 100644 (file)
--- a/distro/pkg/deb/not-installed
+++ b/distro/pkg/deb/not-installed
@@ -1,6 +1,5 @@
 usr/lib/knot-resolver/kres_modules/http/LICENSE
 usr/lib/knot-resolver/kres_modules/etcd.lua
-debian/tmp/usr/share/doc/knot-resolver/html/.buildinfo
 usr/include/libkres/*.h
 usr/lib/*.so
 usr/lib/pkgconfig/libkres.pc

diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index f7693be3bc6d1c5815ff8a8279cd1543983b6300..26a2ff3f9f9b9ee182fcfc2727d5a8acd3aa5ff9 100755 (executable)
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -27,7 +27,6 @@ override_dh_auto_build:
                --buildtype=plain \
                --prefix=/usr \
                --libdir=lib \
-               -Ddoc=enabled \
                -Dsystemd_files=enabled \
                -Dclient=enabled \
                -Ddnstap=enabled \
@@ -38,7 +37,6 @@ override_dh_auto_build:
                -Dc_args="$${CFLAGS}" \
                -Dc_link_args="$${LDFLAGS}"
        ninja -v -C build_deb
-       ninja -v -C build_deb doc
        dh_auto_build --buildsystem=pybuild --sourcedirectory manager
 
 override_dh_auto_install:

diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index 422381841b6ea2d79a3c1f5c69a9ba7e2b09bb6f..f0318ec3de54632d972f0a3712e677f119bce836 100644 (file)
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -71,7 +71,6 @@ Requires(pre):  shadow-utils
 %endif
 %if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires:  pkgconfig(lmdb)
-BuildRequires:  python3-sphinx
 Requires:       lua5.1-basexx
 Requires:       lua5.1-cqueues
 Requires:       lua5.1-http
@@ -87,21 +86,9 @@ BuildRequires:  openssl-devel
 %if 0%{?suse_version}
 %define NINJA ninja
 BuildRequires:  lmdb-devel
-BuildRequires:  python3-Sphinx
 Requires(pre):  shadow
 %endif
 
-%if "x%{?rhel}" == "x"
-# dependencies for doc package
-# NOTE: doc isn't possible to build on CentOS 7, 8
-#       python2-sphinx is too old and python36-breathe is broken on CentOS 7
-#       python3-breathe isn't available for CentOS 8 (yet? rhbz#1808766)
-BuildRequires:  doxygen
-BuildRequires:  python3-breathe
-BuildRequires:  python3-sphinx_rtd_theme
-BuildRequires:  texinfo
-%endif
-
 %description
 The Knot Resolver is a DNSSEC-enabled caching full resolver implementation
 written in C and LuaJIT, including both a resolver library and a daemon.
@@ -119,16 +106,6 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description devel
 The package contains development headers for Knot Resolver.
 
-%if "x%{?rhel}" == "x"
-%package doc
-Summary:        Documentation for Knot Resolver
-BuildArch:      noarch
-Requires:       %{name} = %{version}-%{release}
-
-%description doc
-Documentation for Knot Resolver
-%endif
-
 %if "x%{?suse_version}" == "x"
 %package module-dnstap
 Summary:        dnstap module for Knot Resolver
@@ -196,9 +173,6 @@ gpg2 --verify %{SOURCE1} %{SOURCE0}
 
 %build
 CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" meson build_rpm \
-%if "x%{?rhel}" == "x"
-    -Ddoc=enabled \
-%endif
     -Dsystemd_files=enabled \
     -Dclient=enabled \
 %if "x%{?suse_version}" == "x"
@@ -217,9 +191,6 @@ CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" meson build_rpm \
     --sysconfdir="%{_sysconfdir}" \
 
 %{NINJA} -v -C build_rpm
-%if "x%{?rhel}" == "x"
-%{NINJA} -v -C build_rpm doc
-%endif
 
 pushd manager
 %py3_build
@@ -392,15 +363,6 @@ fi
 %{_libdir}/pkgconfig/libkres.pc
 %{_libdir}/libkres.so
 
-%if "x%{?rhel}" == "x"
-%files doc
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/html
-%doc %{_datadir}/info/knot-resolver.info*
-%dir %{_datadir}/info/knot-resolver-figures
-%doc %{_datadir}/info/knot-resolver-figures/*
-%endif
-
 %if "x%{?suse_version}" == "x"
 %files module-dnstap
 %{_libdir}/knot-resolver/kres_modules/dnstap.so

diff --git a/doc/meson.build b/doc/meson.build
index 16f7da130dcba4e1f7bad628ed82ce4255458645..a8439c5a6b5f18e4dced24289c92296fd6a5786a 100644 (file)
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -49,11 +49,11 @@ if get_option('doc') == 'enabled'
   else
     python_sphinx_rtd_theme = run_command('python3', '-c', 'import sphinx_rtd_theme', check: false)
     if python_sphinx_rtd_theme.returncode() != 0
-      error('missing doc dependency: python sphinx_rtd_theme')
+      error('missing doc dependency: sphinx_rtd_theme')
     endif
     python_sphinx_tabs = run_command('python3', '-c', 'import sphinx_tabs', check: false)
     if python_sphinx_tabs.returncode() != 0
-      error('missing doc dependency: python python-sphinx-tabs')
+      error('missing doc dependency: python sphinx-tabs')
     endif
   endif
   message('------------------------')