stevej pushed to opendkim (el5). "Fix path to docs in sample config when doc dir is unversioned (#993997)."

[notifications at fedoraproject.org]

>From 91fd8f654c6c3419af59935211563dc6d64d24a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sun, 3 Nov 2013 14:13:45 +0200
Subject: Fix path to docs in sample config when doc dir is unversioned
 (#993997).


diff --git a/opendkim.spec b/opendkim.spec
index 0f7951a..72e9ef0 100644
--- a/opendkim.spec
+++ b/opendkim.spec
@@ -1,9 +1,11 @@
 # systemd-compatible version
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail
 Name: opendkim
 Version: 2.8.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD and Sendmail
 URL: http://opendkim.org/
 Group: System Environment/Daemons
@@ -97,7 +99,7 @@ install -m 0755 contrib/init/redhat/%{name}-default-keygen %{buildroot}%{_sbindi
 
 cat > %{buildroot}%{_sysconfdir}/%{name}.conf << 'EOF'
 ## BASIC OPENDKIM CONFIGURATION FILE
-## See %{name}.conf(5) or %{_docdir}/%{name}-%{version}/%{name}.conf.sample for more
+## See %{name}.conf(5) or %{_pkgdocdir}/%{name}.conf.sample for more
 
 ## BEFORE running OpenDKIM you must:
 
@@ -105,7 +107,7 @@ cat > %{buildroot}%{_sysconfdir}/%{name}.conf << 'EOF'
 ## - generate keys for your domain (if signing)
 ## - edit your DNS records to publish your public keys (if signing)
 
-## See %{_docdir}/%{name}-%{version}/INSTALL for detailed instructions.
+## See %{_pkgdocdir}/INSTALL for detailed instructions.
 
 ## CONFIGURATION OPTIONS
 
@@ -365,6 +367,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Nov  3 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.8.4-3
+- Fix path to docs in sample config when doc dir is unversioned (#993997).
+
 * Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 2.8.4-2
 - Perl 5.18 rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/opendkim.git/commit/?h=el5&id=91fd8f654c6c3419af59935211563dc6d64d24a7