Refactor openssl BR

This commit is contained in:
Zuzana Svetlikova 2017-09-07 18:06:26 +02:00
parent e8fe25864b
commit 5afa09cef4
1 changed files with 5 additions and 16 deletions

View File

@ -21,7 +21,7 @@
%global nodejs_patch 0 %global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
%global nodejs_release 1 %global nodejs_release 2
# == Bundled Dependency Versions == # == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h # v8 - from deps/v8/include/v8-version.h
@ -113,15 +113,7 @@ Requires: http-parser >= 2.7.0
Provides: bundled(http-parser) = %{http_parser_version} Provides: bundled(http-parser) = %{http_parser_version}
%endif %endif
%if 0%{?epel} BuildRequires: (openssl-devel >= 1:1.0.2 or compat-openssl10-devel)
BuildRequires: openssl-devel >= 1:1.0.1
%else
%if 0%{?fedora} > 25
BuildRequires: compat-openssl10-devel >= 1:1.0.2
%else
BuildRequires: openssl-devel >= 1:1.0.2
%endif
%endif
# we need the system certificate store when Patch2 is applied # we need the system certificate store when Patch2 is applied
Requires: ca-certificates Requires: ca-certificates
@ -247,12 +239,6 @@ rm -rf deps/icu-small \
deps/uv \ deps/uv \
deps/zlib deps/zlib
%if 0%{?epel}
%patch2 -p1
%patch5 -p1
%endif
%build %build
# build with debugging symbols and add defines from libuv (#892601) # build with debugging symbols and add defines from libuv (#892601)
# Node's v8 breaks with GCC 6 because of incorrect usage of methods on # Node's v8 breaks with GCC 6 because of incorrect usage of methods on
@ -444,6 +430,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc %{_pkgdocdir}/npm/doc
%changelog %changelog
* Thu Sep 07 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:8.4.0-2
- Refactor openssl BR
* Wed Aug 16 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:8.4.0-1 * Wed Aug 16 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:8.4.0-1
- Update to v8.4.0 - Update to v8.4.0
- https://nodejs.org/en/blog/release/v8.4.0/ - https://nodejs.org/en/blog/release/v8.4.0/