diff --git a/.gitignore b/.gitignore index 150f7ab..15a72d4 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,32 @@ vs-chromium-project.txt /gn-20806f79c6b4.tar.gz /gn-95b0f8fe31a9.tar.gz /gn-feafd1012a32.tar.gz +/gn-468c6128db7f.tar.gz +/gn-c97a86a72105.tar.gz +/gn-ed1abc107815.tar.gz +/gn-ab638bd7cbb9.tar.gz +/gn-4a8016dc3915.tar.gz +/gn-3d0d3445f67d.tar.gz +/gn-7a8aa3a08a13.tar.gz +/gn-18602f6cf116.tar.gz +/gn-6e8e0d6d4a15.tar.gz +/gn-90478db6b59b.tar.gz +/gn-487f8353f154.tar.gz +/gn-0c25d1bbde6e.tar.gz +/gn-cad8f67e2dd0.tar.gz +/gn-ebc8f16ca7b0.tar.gz +/gn-afd24ed11bc5.tar.gz +/gn-54169531ed6d.tar.gz +/gn-635a71e20e99.tar.gz +/gn-c15bfa41e526.tar.gz +/gn-5d0a4153b0bc.tar.gz +/gn-aa3ecaecac29.tar.gz +/gn-81b24e01531e.tar.gz +/gn-07d3c6f4dc29.tar.gz +/gn-092f4f0d612e.tar.gz +/gn-e7f3202128bd.tar.gz +/gn-c5a0003bcc2a.tar.gz +/gn-5964f4997670.tar.gz +/gn-64d35867ca0a.tar.gz +/gn-5550ba0f4053.tar.gz +/gn-9673115bc14c.tar.gz diff --git a/gn.rpmlintrc b/gn.rpmlintrc index 4de8b61..7ae199b 100644 --- a/gn.rpmlintrc +++ b/gn.rpmlintrc @@ -9,3 +9,7 @@ addFilter(r"gn-doc\..*: (zero-length|version-control-internal-file) /.*/examples addFilter(r"gn-doc\..*: hidden-file-or-dir /.*/examples/.*/\.(gitignore|gn)") # This script is for looking at, not for executing: addFilter(r"gn-doc\..*: env-script-interpreter /.*/infra/config/main\.star .*") +# This is as prescribed in +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Emacs/, and the +# macro is not unexpanded in practice. +addFilter(r"Possible unexpanded macro in: Requires:\s+emacs-filesystem") diff --git a/gn.spec b/gn.spec index c171f1b..5eb150a 100644 --- a/gn.spec +++ b/gn.spec @@ -24,11 +24,11 @@ Name: gn # 7. Commit the changes # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit feafd1012a32c05ec6095f69ddc3850afb621f3a -%global access 20241017 +%global commit 9673115bc14c8630da5b7f6fe07e0b362ac49dcb +%global access 20260111 %global shortcommit %{sub %{commit} 1 12} -%global position 2201 -Version: %{position}^%{access}git%{shortcommit} +%global position 2316 +Version: %{position}^%{access}.%{shortcommit} Release: %autorelease Summary: Meta-build system that generates build files for Ninja @@ -42,6 +42,7 @@ Summary: Meta-build system that generates build files for Ninja # not installed; you may verify this with: # gdb -ex 'set pagination off' -ex 'info sources' gn | grep -F gn_test.cc License: BSD-3-Clause AND Unicode-DFS-2016 AND ICU +SourceLicense: %{license} AND Apache-2.0 URL: https://gn.googlesource.com/gn Source0: %{url}/+archive/%{commit}.tar.gz#/gn-%{shortcommit}.tar.gz # Generated using script update-version: @@ -124,7 +125,7 @@ cp -vp misc/vim/README.md README-vim.md %py3_shebang_fix . -%build +%conf AR='gcc-ar'; export AR # Treating warnings as errors is too strict for downstream builds. # @@ -136,6 +137,9 @@ AR='gcc-ar'; export AR --no-last-commit-position \ --no-strip \ --no-static-libstdc++ + + +%build ninja -j %{_smp_build_ncpus} -C out -v %if %{with html_docs} diff --git a/last_commit_position.h b/last_commit_position.h index f7babe5..ef88d41 100644 --- a/last_commit_position.h +++ b/last_commit_position.h @@ -3,7 +3,7 @@ #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ -#define LAST_COMMIT_POSITION_NUM 2201 -#define LAST_COMMIT_POSITION "2201 (feafd1012a32)" +#define LAST_COMMIT_POSITION_NUM 2316 +#define LAST_COMMIT_POSITION "2316 (9673115bc14c)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index e36d482..c8fd12b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-feafd1012a32.tar.gz) = f32d40faf4107da8e00128dbd4435d5a1ea2669000c2a70dcd195499fd09a2c36a7df33ce8dcb8184497771fa390cdcc3545abfdc5cfd92ace545652b30d87b5 +SHA512 (gn-9673115bc14c.tar.gz) = b05e287b5e700e1cd725ef75a0af6088abd51be0a0c072f42daa61e39f6d159355ef95130a9f4478d7c62129a17c51f341624cfc4b58fb7d29e1c77a2e2cf3af