diff --git a/.gitignore b/.gitignore index 9aebf04..a17047c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ /yq-4.43.1.tar.gz +/yq-4.47.1.tar.gz +/yq-4.47.1-vendor.tar.bz2 +/yq-4.53.3.tar.gz +/yq-4.53.3-vendor.tar.bz2 +/yq-4.53.4.tar.gz +/yq-4.53.4-vendor.tar.bz2 diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..167cb29 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,34 @@ +--- +downstream_package_name: yq +upstream_project_url: https://github.com/mikefarah/yq +upstream_tag_template: "v{version}" + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + rawhide: + fast_forward_merge_into: + - fedora-branched + - epel-all + + - job: koji_build + trigger: commit + dist_git_branches: + - rawhide +actions: + post-modifications: + - | + sh -xeuc " + cd $PACKIT_DOWNSTREAM_REPO + export GOTOOLCHAIN=local+auto + spec="$PACKIT_DOWNSTREAM_PACKAGE_NAME.spec" + go_vendor_archive create --config go-vendor-tools.toml "$spec" + go_vendor_license \ + --config go-vendor-tools.toml \ + --path "$spec" \ + report \ + --verify-spec \ + --autofill=auto + " +create_sync_note: false diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml new file mode 100644 index 0000000..f4fa890 --- /dev/null +++ b/go-vendor-tools.toml @@ -0,0 +1,8 @@ +[archive] + +[licensing] +detector = "askalono" +[[licensing.licenses]] +path = "vendor/github.com/apparentlymart/go-textseg/v15/LICENSE" +sha256sum = "59e80949c14925f65181757d837ed93dea3783f62b031f642281d9e5b1936917" +expression = "(MIT AND Apache-2.0) AND Unicode-3.0" diff --git a/sources b/sources index 0a33990..ff85f49 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (yq-4.43.1.tar.gz) = a3bb594421811db613118af5ba002e08ccb4b76a63ddf428bbdd4926cf8614217d67f47bfa4ad2c87361a96ade1841fde656fcf9ed700a8994333d61b9a80a8d +SHA512 (yq-4.53.4.tar.gz) = f5edb9198abfbfff0e54fa7f0de7fa2d34184716fffdd34360e955fa1eca0b06c3f268713cf459863de688648e3ce535f1c2851342b90690904de330fd9f94f3 +SHA512 (yq-4.53.4-vendor.tar.bz2) = 6121e2e7f20642452ec63f3f652ca416eedd9004a6dc5c2854f10fb06657a417277bde379e6759f9d940c162ff4b6587aee9869fcf1475f6aa39dfadaa6f59ac diff --git a/yq-go1_24-replace_error_creation.diff b/yq-go1_24-replace_error_creation.diff deleted file mode 100644 index 617187a..0000000 --- a/yq-go1_24-replace_error_creation.diff +++ /dev/null @@ -1,29 +0,0 @@ -From 6908161f1fb6713db8259909c606109770fe7673 Mon Sep 17 00:00:00 2001 -From: Marco Vito Moscaritolo -Date: Mon, 11 Nov 2024 14:06:04 +0100 -Subject: [PATCH] replace error creation - ---- - pkg/yqlib/operator_error.go | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkg/yqlib/operator_error.go b/pkg/yqlib/operator_error.go -index 1a2283de87..d6a2b67fed 100644 ---- a/pkg/yqlib/operator_error.go -+++ b/pkg/yqlib/operator_error.go -@@ -1,7 +1,7 @@ - package yqlib - - import ( -- "fmt" -+ "errors" - ) - - func errorOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) { -@@ -16,5 +16,5 @@ func errorOperator(d *dataTreeNavigator, context Context, expressionNode *Expres - if rhs.MatchingNodes.Len() > 0 { - errorMessage = rhs.MatchingNodes.Front().Value.(*CandidateNode).Value - } -- return Context{}, fmt.Errorf(errorMessage) -+ return Context{}, errors.New(errorMessage) - } diff --git a/yq.spec b/yq.spec index f6e0b7b..75bdca6 100644 --- a/yq.spec +++ b/yq.spec @@ -1,58 +1,70 @@ -# Generated by go2rpm 1.11.1 -%bcond_without check +# Generated by go2rpm 1.19.0 +%bcond check 1 # https://github.com/mikefarah/yq %global goipath github.com/mikefarah/yq/v4 -Version: 4.43.1 +Version: 4.53.4 %gometa -L -f -%global common_description %{expand: -Yq is a portable command-line YAML, JSON, XML, CSV, TOML and properties -processor.} - -%global golicenses LICENSE -%global godocs examples CODE_OF_CONDUCT.md how-it-works.md project-\\\ - words.txt release_instructions.txt CONTRIBUTING.md\\\ - README.md release_notes.txt Name: yq Release: %autorelease -Summary: Yq is a portable command-line YAML, JSON, XML, CSV, TOML and properties processor +Summary: Yq is a portable command-line YAML, JSON, XML, CSV, TOML, HCL and properties processor -License: MIT +# Generated by go-vendor-tools +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND MPL-2.0 AND Unicode-3.0 URL: %{gourl} -Source: %{gosource} -Patch: https://github.com/mikefarah/yq/commit/6908161f1fb6713db8259909c606109770fe7673.patch#/yq-go1_24-replace_error_creation.diff +Source0: %{gosource} +# Generated by go-vendor-tools +Source1: %{archivename}-vendor.tar.bz2 +Source2: go-vendor-tools.toml -%description %{common_description} +BuildRequires: go-vendor-tools -%gopkg +%description +Yq is a portable command-line YAML, JSON, XML, CSV, TOML, HCL and properties +processor. %prep -%goprep -A -%autopatch -p1 +%goprep -p1 +tar -xf %{S:1} %generate_buildrequires -%go_generate_buildrequires +%go_vendor_license_buildrequires -c %{S:2} %build +%global gomodulesmode GO111MODULE=on %gobuild -o %{gobuilddir}/bin/yq %{goipath} +%{gobuilddir}/bin/%{name} shell-completion bash > %{name}.bash +%{gobuilddir}/bin/%{name} shell-completion fish > %{name}.fish +%{gobuilddir}/bin/%{name} shell-completion zsh > %{name}.zsh + %install +%go_vendor_license_install -c %{S:2} install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ -%if %{with check} +install -Dpm 0644 %{name}.bash %{buildroot}%{bash_completions_dir}/%{name} +install -Dpm 0644 %{name}.fish %{buildroot}%{fish_completions_dir}/%{name}.fish +install -Dpm 0644 %{name}.zsh %{buildroot}%{zsh_completions_dir}/_%{name} + %check -%gocheck +%go_vendor_license_check -c %{S:2} +%if %{with check} +%gotest ./... %endif -%files -%license LICENSE -%doc examples CODE_OF_CONDUCT.md how-it-works.md project-words.txt -%doc release_instructions.txt CONTRIBUTING.md README.md release_notes.txt +%files -f %{go_vendor_license_filelist} +%doc examples CODE_OF_CONDUCT.md CONTRIBUTING.md README.md SECURITY.md +%doc how-it-works.md project-words.txt release_instructions.txt +%doc release_notes.txt %{_bindir}/yq +%{bash_completions_dir}/%{name} +%{fish_completions_dir}/%{name}.fish +%{zsh_completions_dir}/_%{name} + %changelog %autochangelog