Rework package doc handling (RHBZ #1165004).

openvpn.spec

@@ -5,7 +5,7 @@
 
 Name:              openvpn
 Version:           2.3.5
-Release:           1%{?prerelease:.%{prerelease}}%{?dist}
+Release:           2%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -88,7 +88,8 @@ find contrib sample -type f -perm /100 \
     --enable-plugin-auth-pam \
     --enable-pkcs11 \
     --enable-x509-alt-username \
-    --enable-systemd
+    --enable-systemd \
+    --docdir=%{_pkgdocdir}
 %{__make}
 
 ## Build plugins
@@ -149,6 +150,10 @@ cp %{SOURCE2} %{SOURCE3} sample/sample-config-files/
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 
+# Package installs into %%{_pkgdocdir} directly
+# Add further files
+cp -a AUTHORS PORTS INSTALL contrib sample $RPM_BUILD_ROOT%{_pkgdocdir}
+
 # tmpfiles.d
 mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
 install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
@@ -190,9 +195,11 @@ fi
 
 
 %files
-%doc AUTHORS COPYING COPYRIGHT.GPL INSTALL PORTS README
+%{_pkgdocdir}
-# Add NEWS when it isn't zero-length.
+%exclude %{_pkgdocdir}/README.IPv6
-%doc src/plugins/*/README.*
+%exclude %{_pkgdocdir}/README.polarssl
+%exclude %{_pkgdocdir}/management-notes.txt
+
 %doc contrib sample
 %{_mandir}/man8/%{name}.8*
 %{_sbindir}/%{name}
@@ -203,9 +210,11 @@ fi
 %attr(0710,root,openvpn) %dir %{_localstatedir}/run/%{name}/
 %{_prefix}/lib/tmpfiles.d/%{name}.conf
 %config %dir %{_sysconfdir}/%{name}/
-%exclude %{_datadir}/doc/%{name}/
 
 %changelog
+* Fri Nov 21 2014 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.3.5-2
+- Rework package doc handling (RHBZ #1165004).
+
 * Tue Oct 28 2014 Jon Ciesla <limburgher@gmail.com> 2.3.5-1
 - 2.3.5.