diff --git a/SPECS/ninja-build/ninja-build.signatures.json b/SPECS/ninja-build/ninja-build.signatures.json index 6e8863a493..2e45485670 100644 --- a/SPECS/ninja-build/ninja-build.signatures.json +++ b/SPECS/ninja-build/ninja-build.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "macros.ninja": "da6927a7d813672d296148b9611b7a3b262e5db46cbd0eeac55c421f0ca0a270", - "ninja-1.8.2.tar.gz": "86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4" + "ninja-1.10.2.tar.gz": "ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed" } } \ No newline at end of file diff --git a/SPECS/ninja-build/ninja-build.spec b/SPECS/ninja-build/ninja-build.spec index 7235c8d518..6191e996d6 100644 --- a/SPECS/ninja-build/ninja-build.spec +++ b/SPECS/ninja-build/ninja-build.spec @@ -1,18 +1,17 @@ -Name: ninja-build Summary: Small build system with focus on speed -Version: 1.8.2 -Release: 3%{?dist} +Name: ninja-build +Version: 1.10.2 +Release: 1%{?dist} License: ASL 2.0 -URL: https://ninja-build.org Vendor: Microsoft Corporation Distribution: Mariner -#Source0: https://github.com/ninja-build/ninja/archive/v%{version}.tar.gz +URL: https://ninja-build.org +#Source0: https://github.com/ninja-build/ninja/archive/v%%{version}.tar.gz Source0: ninja-%{version}.tar.gz Source1: macros.ninja - BuildRequires: gcc -BuildRequires: python3-devel BuildRequires: gtest-devel +BuildRequires: python3-devel %description Ninja is a small build system with a focus on speed. @@ -38,17 +37,23 @@ install -Dpm0644 %{SOURCE1} %{buildroot}%{_libdir}/rpm/macros.d/macros.ninja %files %license COPYING -%doc HACKING.md README +%doc README.md %{_bindir}/ninja %{_bindir}/ninja-build %{_datadir}/bash-completion/completions/ninja %{_libdir}/rpm/macros.d/macros.ninja %changelog +* Mon Dec 06 2021 Max Brodeur-Urbas - 1.10.2-1 +- Updated to version 1.10.2. +- Removed reference to missing HACKING doc file. + * Thu Apr 23 2020 Pawel Winogrodzki 1.8.2-3 - License verified. - Fixed 'Source0' tag. + * Tue Sep 03 2019 Mateusz Malisz 1.8.2-2 - Initial CBL-Mariner import from Photon (license: Apache2). + * Wed Dec 27 2017 Anish Swaminathan 1.8.2-1 - Initial packaging diff --git a/cgmanifest.json b/cgmanifest.json index 35d4da7692..7d1b41c799 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -14583,8 +14583,8 @@ "type": "other", "other": { "name": "ninja-build", - "version": "1.8.2", - "downloadUrl": "https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz" + "version": "1.10.2", + "downloadUrl": "https://github.com/ninja-build/ninja/archive/v1.10.2.tar.gz" } } }, diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 6a41bbd116..8425026bd3 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -238,8 +238,8 @@ ncurses-debuginfo-6.2-4.cm2.aarch64.rpm ncurses-devel-6.2-4.cm2.aarch64.rpm ncurses-libs-6.2-4.cm2.aarch64.rpm ncurses-term-6.2-4.cm2.aarch64.rpm -ninja-build-1.8.2-3.cm2.aarch64.rpm -ninja-build-debuginfo-1.8.2-3.cm2.aarch64.rpm +ninja-build-1.10.2-1.cm2.aarch64.rpm +ninja-build-debuginfo-1.10.2-1.cm2.aarch64.rpm npth-1.6-4.cm2.aarch64.rpm npth-debuginfo-1.6-4.cm2.aarch64.rpm npth-devel-1.6-4.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 523b82c707..3246441b10 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -238,8 +238,8 @@ ncurses-debuginfo-6.2-4.cm2.x86_64.rpm ncurses-devel-6.2-4.cm2.x86_64.rpm ncurses-libs-6.2-4.cm2.x86_64.rpm ncurses-term-6.2-4.cm2.x86_64.rpm -ninja-build-1.8.2-3.cm2.x86_64.rpm -ninja-build-debuginfo-1.8.2-3.cm2.x86_64.rpm +ninja-build-1.10.2-1.cm2.x86_64.rpm +ninja-build-debuginfo-1.10.2-1.cm2.x86_64.rpm npth-1.6-4.cm2.x86_64.rpm npth-debuginfo-1.6-4.cm2.x86_64.rpm npth-devel-1.6-4.cm2.x86_64.rpm