diff --git a/.gitignore b/.gitignore index c6e9f74..396593f 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ /gn-e62d4e19.tar.gz /gn-29accf5a.tar.gz /gn-03ce92df.tar.gz +/gn-9ef32177.tar.gz +/gn-9ef321772ecc.tar.gz diff --git a/gn.spec b/gn.spec index dc3817f..e5de410 100644 --- a/gn.spec +++ b/gn.spec @@ -24,10 +24,10 @@ Name: gn # 7. Commit the changes # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 03ce92df5f9875bd9929b564be4b612713569aa9 -%global access 20220707 -%global shortcommit %(echo '%{commit}' | cut -b -8) -%global position 2049 +%global commit 9ef321772ecc161937db69acb346397e0ccc484d +%global access 20220714 +%global shortcommit %(echo '%{commit}' | cut -b -12) +%global position 2050 Version: %{position}^%{access}git%{shortcommit} Release: %autorelease Summary: Meta-build system that generates build files for Ninja diff --git a/last_commit_position.h b/last_commit_position.h index 9e9b12d..651c3ea 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 2049 -#define LAST_COMMIT_POSITION "2049 (03ce92df)" +#define LAST_COMMIT_POSITION_NUM 2050 +#define LAST_COMMIT_POSITION "2050 (9ef321772ecc)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index b3f5517..e375bb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-03ce92df.tar.gz) = 840b4577dfa86e8c311435f3c3ac940decfeb133151695122ec18117b4c4ba8e5db9b6f3487b80dfc64fa12f053bc17e375a885048cb386f1a42ac741d1a93dd +SHA512 (gn-9ef321772ecc.tar.gz) = c45648b3f1f45c02462cef017da499a027bc14426d37b673deabd3ed55a9388d1f26c350af8380de65455f973459ae03c6af3693a5cd919a20031e3cbca46ffb diff --git a/update-version b/update-version index cc0ed43..a883006 100755 --- a/update-version +++ b/update-version @@ -80,7 +80,7 @@ POSITION="$( sed -r -i \ -e 's/(%global[[:blank:]]+commit[[:blank:]]+)[[:xdigit:]]{40}[[:blank:]]*$/\1'"${COMMIT}/" \ - -e 's/(%global[[:blank:]]+access[[:blank:]]+)[[:digit:]]{8}[[:blank:]]*$/\1'"$( + -e 's/(%global[[:blank:]]+access[[:blank:]]+)[[:digit:]]{12}[[:blank:]]*$/\1'"$( date -u '+%Y%m%d' )/" \ -e 's/(%global[[:blank:]]+position[[:blank:]]+)[[:digit:]]+[[:blank:]]*$/\1'"${POSITION}/" \