[knot/f19: 10/10] use unversioned documentation directory

jvcelak jvcelak at fedoraproject.org
Sun Sep 1 16:33:45 UTC 2013


commit 7bcbcaf1f88f0059d0fc397d7475824f758e56da
Author: Jan Vcelak <jvcelak at fedoraproject.org>
Date:   Sun Sep 1 18:10:47 2013 +0200

    use unversioned documentation directory
    
    https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
    
    Resolves: #993904

 knot.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/knot.spec b/knot.spec
index 4d1dadb..193ab7b 100644
--- a/knot.spec
+++ b/knot.spec
@@ -1,4 +1,5 @@
 %global _hardened_build 1
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Summary: An authoritative DNS daemon
 Name: knot
@@ -48,9 +49,9 @@ install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
 
 # install config samples into docdir
-install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}/samples
+install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples
 for sample_file in knot.full.conf knot.keys.conf example.com.zone; do
-	install -p -m 0644 samples/${sample_file} %{buildroot}%{_docdir}/%{name}-%{version}/samples
+	install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples
 done
 
 %check
@@ -78,7 +79,6 @@ fi
 
 %files
 %doc COPYING AUTHORS NEWS README THANKS
-%doc %{_docdir}/%{name}-%{version}/samples
 %dir %attr(750,root,knot) %{_sysconfdir}/%{name}
 %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/%{name}/%{name}.conf
 %dir %attr(-,knot,knot) %{_sharedstatedir}/%{name}


More information about the scm-commits mailing list