PR#2: Update to 0.11.4 - rpms/golang-github-google-cel

rpms / golang-github-google-cel

#2 Update to 0.11.4

Merged 2 years ago by eclipseo. Opened 2 years ago by mikelo2.

rpms/ mikelo2/golang-github-google-cel update-0.11 into rawhide

Update to 0.11.4 - Closes rhbz#1963633 rhbz#2045513

Mikel Olasagasti Uranga • 2 years ago

e018fb5

Convert to rpmautospec

Mikel Olasagasti Uranga • 2 years ago

8f95a73

Generate the ANTLR parser from source

Jerry James • 2 years ago

6faba75

.gitignore

file modified

		`@@ -1,2 +1,3 @@`
		`/cel-go-4c3317a66a3a4ce51b74b76360f59282da52e03d.tar.gz`
		`/cel-go-0.7.0.tar.gz`
		`+ /cel-go-0.11.4.tar.gz`

changelog

file added

+17

		`@@ -0,0 +1,17 @@`
		`+ * Fri Jun 10 2022 Jerry James <loganjerry@gmail.com> - 0.7.0-4`
		`+ - Generate the ANTLR parser from source`
		`+`
		`+ * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-4`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild`
		`+`
		`+ * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-3`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild`
		`+`
		`+ * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-2`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`
		`+`
		`+ * Fri Jan 15 21:18:48 CET 2021 Robert-André Mauchin <zebob.m@gmail.com> - 0.7.0-1`
		`+ - Update to 0.7.0`
		`+`
		`+ * Wed Dec 23 09:21:17 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 0.6.0-1.20201223git4c3317a`
		`+ - Initial package`

golang-github-google-cel.spec

file modified

+20 -52

		`@@ -1,9 +1,10 @@`
		`- # Generated by go2rpm 1.3`
		`+ # Generated by go2rpm 1.6.0`
		`%bcond_without check`
		`+ %global debug_package %{nil}`

		`# https://github.com/google/cel-go`
		`%global goipath github.com/google/cel-go`
		`- Version: 0.7.0`
		`+ Version: 0.11.4`

		`%gometa`

		`@@ -13,10 +14,10 @@`
		`identical to equivalent expressions in C++, Go, Java, and TypeScript.}`

		`%global golicenses LICENSE`
		`- %global godocs examples CODE_OF_CONDUCT.md CONTRIBUTING.md`
		`+ %global godocs examples CODE_OF_CONDUCT.md CONTRIBUTING.md README.md`

		`Name: %{goname}`
		`- Release: 4%{?dist}`
		`+ Release: %autorelease`
		`Summary: Fast, portable, non-Turing complete expression evaluation`

		`# Upstream license specification: Apache-2.0`
		`@@ -24,40 +25,7 @@`
		`URL: %{gourl}`
		`Source0: %{gosource}`

		`- BuildRequires: golang(github.com/antlr/antlr4/runtime/Go/antlr)`
		`- BuildRequires: golang(github.com/golang/glog)`
		`- BuildRequires: golang(github.com/golang/protobuf/proto)`
		`- BuildRequires: golang(github.com/golang/protobuf/ptypes/any)`
		`- BuildRequires: golang(github.com/golang/protobuf/ptypes/duration)`
		`- BuildRequires: golang(github.com/golang/protobuf/ptypes/struct)`
		`- BuildRequires: golang(github.com/golang/protobuf/ptypes/timestamp)`
		`- BuildRequires: golang(github.com/golang/protobuf/ptypes/wrappers)`
		`- BuildRequires: golang(github.com/google/cel-spec/proto/test/v1/proto2/test_all_types)`
		`- BuildRequires: golang(github.com/google/cel-spec/proto/test/v1/proto3/test_all_types)`
		`- BuildRequires: golang(github.com/google/cel-spec/tools/celrpc)`
		`- BuildRequires: golang(github.com/stoewer/go-strcase)`
		`- BuildRequires: golang(golang.org/x/text/width)`
		`- BuildRequires: golang(google.golang.org/genproto/googleapis/api/expr/conformance/v1alpha1)`
		`- BuildRequires: golang(google.golang.org/genproto/googleapis/api/expr/v1alpha1)`
		`- BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/context/attribute_context)`
		`- BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/status)`
		`- BuildRequires: golang(google.golang.org/grpc/codes)`
		`- BuildRequires: golang(google.golang.org/grpc/status)`
		`- BuildRequires: golang(google.golang.org/protobuf/encoding/protojson)`
		`- BuildRequires: golang(google.golang.org/protobuf/encoding/prototext)`
		`- BuildRequires: golang(google.golang.org/protobuf/proto)`
		`- BuildRequires: golang(google.golang.org/protobuf/reflect/protodesc)`
		`- BuildRequires: golang(google.golang.org/protobuf/reflect/protoreflect)`
		`- BuildRequires: golang(google.golang.org/protobuf/reflect/protoregistry)`
		`- BuildRequires: golang(google.golang.org/protobuf/runtime/protoimpl)`
		`- BuildRequires: golang(google.golang.org/protobuf/types/descriptorpb)`
		`- BuildRequires: golang(google.golang.org/protobuf/types/dynamicpb)`
		`- BuildRequires: golang(google.golang.org/protobuf/types/known/anypb)`
		`- BuildRequires: golang(google.golang.org/protobuf/types/known/durationpb)`
		`- BuildRequires: golang(google.golang.org/protobuf/types/known/emptypb)`
		`- BuildRequires: golang(google.golang.org/protobuf/types/known/structpb)`
		`- BuildRequires: golang(google.golang.org/protobuf/types/known/timestamppb)`
		`- BuildRequires: golang(google.golang.org/protobuf/types/known/wrapperspb)`
		`+ BuildRequires: antlr4`

		`%description`
		`%{common_description}`
		`@@ -67,28 +35,28 @@`
		`%prep`
		`%goprep`

		`+ %generate_buildrequires`
		`+ %go_generate_buildrequires`
		`+`
		`+ %build`
		`+ # Regenerate ANTLR files`
		`+ pushd parser/gen`
		`+ antlr4 -Dlanguage=Go -package gen -visitor CEL.g4`
		`+ popd`
		`+`
		`%install`
		`%gopkginstall`

		`%if %{with check}`
		`%check`
		`+ # Some test fail due to overflows`
		`+ %ifarch i686`
		`+ rm common/types/int_test.go`
		`+ %endif`
		`%gocheck -d server`
		`%endif`

		`%gopkgfiles`

		`%changelog`
		`- * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-4`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild`
		`-`
		`- * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-3`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild`
		`-`
		`- * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-2`
		`- - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`
		`-`
		`- * Fri Jan 15 21:18:48 CET 2021 Robert-André Mauchin <zebob.m@gmail.com> - 0.7.0-1`
		`- - Update to 0.7.0`
		`-`
		`- * Wed Dec 23 09:21:17 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 0.6.0-1.20201223git4c3317a`
		`- - Initial package`
		`+ %autochangelog`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (cel-go-0.7.0.tar.gz) = 895fd1a80c3a5eb2de7695986276ad05b97079f3ed192f7a948ea3b555c1bf7a3e002941ffb9b57ab7df1ee04869aa0ffcd5417eb70d77bce973b1fc43913b57`
		`+ SHA512 (cel-go-0.11.4.tar.gz) = 9267cb83abb090e23663cad779a7ea6bc966ab4bf2dd116daf56458ba37f4eeb52ba15bc11e0b7b560e63520acdb45c728e604f5bfc3a703956674b58b807691`

mikelo2 commented 2 years ago

Generate the ANTLR parser from source
Convert to rpmautospec
Use dynamic BuildRequires

jjames commented 2 years ago

It looks like the new version is broken on 32-bit platforms. That aside, with this change I can build the package successfully with ANTLR 4.10.1 on x86_64. All tests pass.

3 new commits added

Update to 0.11.4 - Closes rhbz#1963633 rhbz#2045513
Convert to rpmautospec
Generate the ANTLR parser from source

2 years ago

mikelo2 commented 2 years ago

Removed the test that fails for i686 and now the scratch build ends correctly.

I let someone from go-sig or @eclipseo to review the PR, but if after some time there is no feedback I'll merge it. Meantime, can you close the other PR?

jjames commented 2 years ago

Sure. Thank you for the feedback and improvements.

gotmax23 commented on line 75 of golang-github-google-cel.spec 2 years ago

I would recommend moving this to %build. This way, packagers can run fedpkg prep without all the dependencies installed. Even besides that, I still think this should be in %build, as it's actually generating files.

3 new commits added