use unversioned docdir for -docs subpackage

https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
- use main package's docdir instead of a seperate -docs directory

DO NOT BACKPORT THIS COMMIT TO PREVIOUS FEDORA RELEASES
This commit is contained in:
T.C. Hollingsworth 2013-08-04 20:32:28 -07:00
parent a22461bf51
commit 93798a9a79

View File

@ -1,6 +1,6 @@
Name: nodejs Name: nodejs
Version: 0.10.14 Version: 0.10.14
Release: 1%{?dist} Release: 2%{?dist}
Summary: JavaScript runtime Summary: JavaScript runtime
License: MIT and ASL 2.0 and ISC and BSD License: MIT and ASL 2.0 and ISC and BSD
Group: Development/Languages Group: Development/Languages
@ -132,10 +132,10 @@ EOF
chmod 0755 %{buildroot}%{_rpmconfigdir}/nodejs_native.req chmod 0755 %{buildroot}%{_rpmconfigdir}/nodejs_native.req
#install documentation #install documentation
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-docs-%{version}/html mkdir -p %{buildroot}%{_pkgdocdir}/html
cp -pr doc/* %{buildroot}%{_defaultdocdir}/%{name}-docs-%{version}/html cp -pr doc/* %{buildroot}%{_pkgdocdir}/html
rm -f %{_defaultdocdir}/%{name}-docs-%{version}/html/nodejs.1 rm -f %{buildroot}%{_pkgdocdir}/html/nodejs.1
cp -p LICENSE %{buildroot}%{_defaultdocdir}/%{name}-docs-%{version}/ cp -p LICENSE %{buildroot}%{_pkgdocdir}/html
#install development headers #install development headers
#FIXME: we probably don't really need *.h but node-gyp downloads the whole #FIXME: we probably don't really need *.h but node-gyp downloads the whole
@ -162,9 +162,16 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
%{_datadir}/node/common.gypi %{_datadir}/node/common.gypi
%files docs %files docs
%{_defaultdocdir}/%{name}-docs-%{version} %dir %{_pkgdocdir}
%{_pkgdocdir}/html
%exclude %{_pkgdocdir}/(ChangeLog|LICENSE|README.md|AUTHORS)
%changelog %changelog
* Mon Aug 05 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.14-2
- use unversioned docdir for -docs subpackage
https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
- use main package's docdir instead of a seperate -docs directory
* Thu Jul 25 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.14-1 * Thu Jul 25 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.14-1
- new upstream release 0.10.14 - new upstream release 0.10.14
http://blog.nodejs.org/2013/07/25/node-v0-10-14-stable/ http://blog.nodejs.org/2013/07/25/node-v0-10-14-stable/