From cf2fe3211bd55c6afc71a8a935dd1c66e1b99236 Mon Sep 17 00:00:00 2001 From: basebuilder_pel7x64builder0 Date: Sat, 2 Jun 2018 22:24:20 +0200 Subject: [PATCH] openvpn change pkgdocdir into current marcro Signed-off-by: basebuilder_pel7x64builder0 --- SPECS/openvpn.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/SPECS/openvpn.spec b/SPECS/openvpn.spec index 03cc1af9..7cffd15f 100644 --- a/SPECS/openvpn.spec +++ b/SPECS/openvpn.spec @@ -85,7 +85,7 @@ find contrib sample -type f -perm /100 \ --enable-selinux \ --enable-systemd \ --enable-x509-alt-username \ - --docdir=%{_pkgdocdir} \ + --docdir=%{_docdir}/%{name} \ SYSTEMD_UNIT_DIR=%{_unitdir} \ TMPFILES_DIR=%{_tmpfilesdir} \ IPROUTE=/sbin/ip @@ -138,14 +138,14 @@ mkdir -m 0770 -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name} # DEPRECATED openvpn@.service ... this unit file will be removed in EPEL8 install -D -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/ -# Package installs into %%{_pkgdocdir} directly +# Package installs into %%{_docdir}/%{name} directly # Add various additional files -cp -a AUTHORS ChangeLog contrib sample distro/systemd/README.systemd $RPM_BUILD_ROOT%{_pkgdocdir} +cp -a AUTHORS ChangeLog contrib sample distro/systemd/README.systemd $RPM_BUILD_ROOT%{_docdir}/%{name} # Remove some files which does not really belong here -rm -f $RPM_BUILD_ROOT%{_pkgdocdir}/sample/Makefile{,.in,.am} -rm -f $RPM_BUILD_ROOT%{_pkgdocdir}/contrib/multilevel-init.patch -rm -rf $RPM_BUILD_ROOT%{_pkgdocdir}/sample/sample-keys +rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/sample/Makefile{,.in,.am} +rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/contrib/multilevel-init.patch +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/sample/sample-keys %pre getent group openvpn &>/dev/null || groupadd -r openvpn @@ -168,10 +168,10 @@ getent passwd openvpn &>/dev/null || \ %files -%{_pkgdocdir} -%exclude %{_pkgdocdir}/README.IPv6 -%exclude %{_pkgdocdir}/README.mbedtls -%exclude %{_pkgdocdir}/sample/sample-plugins +%{_docdir}/%{name} +%exclude %{_docdir}/%{name}/README.IPv6 +%exclude %{_docdir}/%{name}/README.mbedtls +%exclude %{_docdir}/%{name}/sample/sample-plugins %{_mandir}/man8/%{name}.8* %{_sbindir}/%{name} %{_libdir}/%{name}/ @@ -187,7 +187,7 @@ getent passwd openvpn &>/dev/null || \ %attr(0770,openvpn,openvpn) %{_sharedstatedir}/%{name} %files devel -%{_pkgdocdir}/sample/sample-plugins +%{_docdir}/%{name}/sample/sample-plugins %{_includedir}/openvpn-plugin.h %{_includedir}/openvpn-msg.h