[nodejs/f20: 3/3] fix duplicated/conflicting documentation files (RHBZ#1001253)

T.C. Hollingsworth patches at fedoraproject.org
Tue Aug 27 08:58:33 UTC 2013


commit 2dfcabecae92725903c29f08f2f3c1a6bbafb154
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Aug 27 01:57:07 2013 -0700

    fix duplicated/conflicting documentation files (RHBZ#1001253)

 nodejs.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/nodejs.spec b/nodejs.spec
index fe1dec1..908b850 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -137,6 +137,7 @@ mkdir -p %{buildroot}%{_pkgdocdir}/html
 cp -pr doc/* %{buildroot}%{_pkgdocdir}/html
 rm -f %{buildroot}%{_pkgdocdir}/html/nodejs.1
 cp -p LICENSE %{buildroot}%{_pkgdocdir}/html
+cp -p ChangeLog LICENSE README.md AUTHORS %{buildroot}%{_pkgdocdir}
 
 #install development headers
 #FIXME: we probably don't really need *.h but node-gyp downloads the whole
@@ -149,13 +150,17 @@ mkdir -p %{buildroot}%{_datadir}/node
 cp -p common.gypi %{buildroot}%{_datadir}/node
 
 %files
-%doc ChangeLog LICENSE README.md AUTHORS
 %{_bindir}/node
 %{_mandir}/man1/node.*
 %dir %{_prefix}/lib/node_modules
 %dir %{_datadir}/node
 %{_rpmconfigdir}/fileattrs/nodejs_native.attr
 %{_rpmconfigdir}/nodejs_native.req
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/ChangeLog
+%{_pkgdocdir}/LICENSE
+%{_pkgdocdir}/README.md
+%{_pkgdocdir}/AUTHORS
 
 %files devel
 %{_bindir}/node_g
@@ -165,12 +170,12 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
 %files docs
 %dir %{_pkgdocdir}
 %{_pkgdocdir}/html
-%exclude %{_pkgdocdir}/(ChangeLog|LICENSE|README.md|AUTHORS)
 
 %changelog
 * Tue Aug 27 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.17-1
 - new upstream release 0.10.17
   http://blog.nodejs.org/2013/08/21/node-v0-10-17-stable/
+- fix duplicated/conflicting documentation files (RHBZ#1001253)
 
 * Sat Aug 17 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.16-1
 - new upstream release 0.10.16


More information about the scm-commits mailing list