[packages/opendmarc] docdir and %doc conflict, remove files installed by make install

glen glen at pld-linux.org
Thu May 29 11:58:34 CEST 2014


commit e674f9601a7f4fc20d5c36efafc618d8b5eff693
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 29 12:58:10 2014 +0300

    docdir and %doc conflict, remove files installed by make install

 opendmarc.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/opendmarc.spec b/opendmarc.spec
index 7b530ef..d5e5bcb 100644
--- a/opendmarc.spec
+++ b/opendmarc.spec
@@ -76,8 +76,9 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf <<EOF
 D %{_localstatedir}/run/%{name} 0700 %{name} %{name} -
 EOF
 
-mv $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 rm $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
+# packages as %doc
+rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 install -d $RPM_BUILD_ROOT%{_includedir}/%{name}
 cp -p libopendmarc/dmarc.h $RPM_BUILD_ROOT%{_includedir}/%{name}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opendmarc.git/commitdiff/e674f9601a7f4fc20d5c36efafc618d8b5eff693



More information about the pld-cvs-commit mailing list