[openvpn/epel7] Undoc docdir bits.

Jon Ciesla limb at fedoraproject.org
Tue Dec 2 20:53:55 UTC 2014


commit 6b41184cdc7a5d9d3d188f0d04db9e2d622a48d2
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Dec 2 14:52:47 2014 -0600

    Undoc docdir bits.

 openvpn.spec |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/openvpn.spec b/openvpn.spec
index e41d3a0..4a14aa3 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -88,8 +88,7 @@ find contrib sample -type f -perm /100 \
     --enable-plugin-auth-pam \
     --enable-pkcs11 \
     --enable-x509-alt-username \
-    --enable-systemd \
-    --docdir=%{_pkgdocdir}
+    --enable-systemd
 %{__make}
 
 ## Build plugins
@@ -150,10 +149,6 @@ 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
@@ -195,11 +190,9 @@ fi
 
 
 %files
-%{_pkgdocdir}
-%exclude %{_pkgdocdir}/README.IPv6
-%exclude %{_pkgdocdir}/README.polarssl
-%exclude %{_pkgdocdir}/management-notes.txt
-
+%doc AUTHORS COPYING COPYRIGHT.GPL INSTALL PORTS README
+# Add NEWS when it isn't zero-length.
+%doc src/plugins/*/README.*
 %doc contrib sample
 %{_mandir}/man8/%{name}.8*
 %{_sbindir}/%{name}
@@ -210,9 +203,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
 * Mon Dec 01 2014 Jon Ciesla <limburgher at gmail.com> 2.3.6-1
+- Undo docdir stuff for epel7.
 - 2.3.6, CVE-2014-8104.
 
 * Fri Nov 21 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.3.5-2


More information about the scm-commits mailing list