refactor boostrapping sections
- split sections per topic - do not nest if macros - use %without where appropriate Related: rhbz#2056971 Signed-off-by: Jan Staněk <jstanek@redhat.com>
This commit is contained in:
		
							parent
							
								
									415fcd5efe
								
							
						
					
					
						commit
						95028d5f44
					
				
							
								
								
									
										17
									
								
								nodejs.spec
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								nodejs.spec
									
									
									
									
									
								
							@ -189,13 +189,17 @@ BuildRequires: libatomic
 | 
			
		||||
BuildRequires: systemtap-sdt-devel
 | 
			
		||||
 | 
			
		||||
%if %{with bootstrap}
 | 
			
		||||
Provides: bundled(libuv) = %{libuv_version}
 | 
			
		||||
Provides: bundled(nghttp2) = %{nghttp2_version}
 | 
			
		||||
Provides:      bundled(libuv) = %{libuv_version}
 | 
			
		||||
%else
 | 
			
		||||
BuildRequires: libuv-devel >= 1:%{libuv_version}
 | 
			
		||||
Requires: libuv >= 1:%{libuv_version}
 | 
			
		||||
Requires:      libuv >= 1:%{libuv_version}
 | 
			
		||||
%endif
 | 
			
		||||
 | 
			
		||||
%if %{with bootstrap}
 | 
			
		||||
Provides:      bundled(nghttp2) = %{nghttp2_version}
 | 
			
		||||
%else
 | 
			
		||||
BuildRequires: libnghttp2-devel >= %{nghttp2_version}
 | 
			
		||||
Requires: libnghttp2 >= %{nghttp2_version}
 | 
			
		||||
Requires:      libnghttp2 >= %{nghttp2_version}
 | 
			
		||||
%endif
 | 
			
		||||
 | 
			
		||||
# Temporarily bundle llhttp because the upstream doesn't
 | 
			
		||||
@ -288,9 +292,7 @@ Requires: zlib-devel%{?_isa}
 | 
			
		||||
Requires: brotli-devel%{?_isa}
 | 
			
		||||
Requires: nodejs-packaging
 | 
			
		||||
 | 
			
		||||
%if %{with bootstrap}
 | 
			
		||||
# deps are bundled
 | 
			
		||||
%else
 | 
			
		||||
%if %{without bootstrap}
 | 
			
		||||
Requires: libuv-devel%{?_isa}
 | 
			
		||||
%endif
 | 
			
		||||
 | 
			
		||||
@ -679,6 +681,7 @@ end
 | 
			
		||||
%changelog
 | 
			
		||||
* Mon Apr 25 2022 Jan Staněk <jstanek@redhat.com> - 1:16.14.0-5
 | 
			
		||||
- Unify configure calls into single command
 | 
			
		||||
- Refactor bootstrap-related parts
 | 
			
		||||
 | 
			
		||||
* Mon Apr 11 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.14.0-4
 | 
			
		||||
- Apply lock file validation fixes
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user