Merge branch 'f21' into f22
Conflicts: nodejs.spec
This commit is contained in:
		
						commit
						a2ef738c4d
					
				| @ -1,6 +1,6 @@ | |||||||
| Name: nodejs | Name: nodejs | ||||||
| Version: 0.10.36 | Version: 0.10.36 | ||||||
| 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,7 +37,7 @@ Patch4: nodejs-revert-utf8-node.patch | |||||||
| 
 | 
 | ||||||
| # V8 presently breaks ABI at least every x.y release while never bumping SONAME, | # V8 presently breaks ABI at least every x.y release while never bumping SONAME, | ||||||
| # so we need to be more explicit until spot fixes that | # so we need to be more explicit until spot fixes that | ||||||
| %global v8_ge 1:3.14.5.7 | %global v8_ge 1:3.14.5.10-17 | ||||||
| %global v8_lt 1:3.15 | %global v8_lt 1:3.15 | ||||||
| %global v8_abi 3.14 | %global v8_abi 3.14 | ||||||
| 
 | 
 | ||||||
| @ -202,6 +202,9 @@ cp -p common.gypi %{buildroot}%{_datadir}/node | |||||||
| %{_pkgdocdir}/html | %{_pkgdocdir}/html | ||||||
| 
 | 
 | ||||||
| %changelog | %changelog | ||||||
|  | * Tue Feb 24 2015 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.36-3 | ||||||
|  | - bump v8 requires (RHBZ#1195457) | ||||||
|  | 
 | ||||||
| * Thu Feb 19 2015 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.36-2 | * Thu Feb 19 2015 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.10.36-2 | ||||||
| - build against compat-libuv010 | - build against compat-libuv010 | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user