Merge branch 'f19'

Conflicts:
	nodejs.spec
This commit is contained in:
T.C. Hollingsworth 2013-08-14 02:08:33 -07:00
commit bb22b1aff5

View file

@ -1,6 +1,6 @@
Name: nodejs Name: nodejs
Version: 0.10.14 Version: 0.10.14
Release: 2%{?dist} Release: 3%{?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
@ -37,8 +37,8 @@ BuildRequires: zlib-devel
# Node.js requires some features from openssl 1.0.1 for SPDY support # Node.js requires some features from openssl 1.0.1 for SPDY support
BuildRequires: openssl-devel >= 1:1.0.1 BuildRequires: openssl-devel >= 1:1.0.1
Requires: v8%{?isa} >= %{v8_ge} Requires: v8%{?_isa} >= %{v8_ge}
Requires: v8%{?isa} < %{v8_lt} Requires: v8%{?_isa} < %{v8_lt}
#we need ABI virtual provides where SONAMEs aren't enough/not present so deps #we need ABI virtual provides where SONAMEs aren't enough/not present so deps
#break when binary compatibility is broken #break when binary compatibility is broken
@ -167,6 +167,9 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
%exclude %{_pkgdocdir}/(ChangeLog|LICENSE|README.md|AUTHORS) %exclude %{_pkgdocdir}/(ChangeLog|LICENSE|README.md|AUTHORS)
%changelog %changelog
* Wed Aug 14 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.14-3
- fix typo in _isa macro in v8 Requires
* Mon Aug 05 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.14-2 * Mon Aug 05 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.14-2
- use unversioned docdir for -docs subpackage - use unversioned docdir for -docs subpackage
https://fedoraproject.org/wiki/Changes/UnversionedDocdirs https://fedoraproject.org/wiki/Changes/UnversionedDocdirs