From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 4 Jun 2018 13:34:34 +0000 (+0200)
Subject: distro: move kresd.systemd man page
X-Git-Tag: v2.4.0~1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cbef95ce9640232d998e155d9a6d07620e5e22c;p=thirdparty%2Fknot-resolver.git

distro: move kresd.systemd man page
---

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index 963bf9c54..c30cc944a 100644
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -49,7 +49,7 @@ package() {
 	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-control@.socket" "${pkgdir}/usr/lib/systemd/system/kresd-control@.socket"
 	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-tls.socket" "${pkgdir}/usr/lib/systemd/system/kresd-tls.socket"
 	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd@.service" "${pkgdir}/usr/lib/systemd/system/kresd@.service"
-	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/doc/kresd.systemd.7" "${pkgdir}/usr/share/man/man7/kresd.systemd.7"
+	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd.systemd.7" "${pkgdir}/usr/share/man/man7/kresd.systemd.7"
 	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/tmpfiles/knot-resolver.conf" "${pkgdir}/usr/lib/tmpfiles.d/knot-resolver.conf"
 	install -dm 0775 "${pkgdir}/etc/knot-resolver"
 	install -Dm 0644 "${srcdir}/kresd.conf" "${pkgdir}/etc/knot-resolver/kresd.conf"
diff --git a/doc/kresd.systemd.7 b/distro/common/systemd/kresd.systemd.7
similarity index 100%
rename from doc/kresd.systemd.7
rename to distro/common/systemd/kresd.systemd.7
diff --git a/distro/deb/debian/knot-resolver.manpages b/distro/deb/debian/knot-resolver.manpages
index 5ff01b817..9f97677b9 100644
--- a/distro/deb/debian/knot-resolver.manpages
+++ b/distro/deb/debian/knot-resolver.manpages
@@ -1,2 +1,2 @@
 debian/tmp/usr/share/man/man8/kresd.8
-doc/kresd.systemd.7
+distro/common/systemd/kresd.systemd.7
diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 5fdd6b2f5..2c2c1c3cd 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -140,7 +140,7 @@ install -m 0664 -p %SOURCE3 %{buildroot}%{_sysconfdir}/knot-resolver/root.keys
 mkdir -p %{buildroot}%{_unitdir}
 install -m 0644 -p %{repodir}/systemd/kresd@.service %{buildroot}%{_unitdir}/kresd@.service
 mkdir -p %{buildroot}%{_mandir}/man7
-install -m 0644 -p %{repodir}/doc/kresd.systemd.7 %{buildroot}%{_mandir}/man7/kresd.systemd.7
+install -m 0644 -p %{repodir}/distro/common/systemd/kresd.systemd.7 %{buildroot}%{_mandir}/man7/kresd.systemd.7
 
 %if 0%{?rhel}
 # no socket activation for CentOS 7 (requires systemd.227)
diff --git a/systemd/README.md b/systemd/README.md
index 3422d1ae9..3d8a8db86 100644
--- a/systemd/README.md
+++ b/systemd/README.md
@@ -22,7 +22,7 @@ Notes
 -----
 
 *  If you're using the upstream systemd unit files, don't forget to also include
-   doc/kresd.systemd.7 manual page in the package.
+   kresd.systemd.7 manual page in the package.
 *  Distributions using systemd-sysv-generator should mask kresd.service to
    be consistent with other distributions. Any use of kresd.service instead of
    kresd@N.service is discouraged to avoid confusing the users.