diff --git a/.gitignore b/.gitignore index 9c01938..a17047c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +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 index 771eb1c..f4fa890 100644 --- a/go-vendor-tools.toml +++ b/go-vendor-tools.toml @@ -3,6 +3,6 @@ [licensing] detector = "askalono" [[licensing.licenses]] -path = "vendor/go.yaml.in/yaml/v3/LICENSE" -sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b" -expression = "MIT AND (MIT AND Apache-2.0)" +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 db89950..ff85f49 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yq-4.47.1.tar.gz) = 16bec8fb67f4fb92fa881110028edbadf3e4fefeb3f59421c3c0e261acce9df6f085d12fadd0ae4b2212251e709bc6f6f692d133b4616cc450fbe6bbf5c43225 -SHA512 (yq-4.47.1-vendor.tar.bz2) = 1027061ebb90800dd2b163f3964f16fa05b4dddd44d18ea2c823c806775f5cb34c115fe1201d627e3c19fdf5b0463b54fb7697caa0486f1aeb55651abc744678 +SHA512 (yq-4.53.4.tar.gz) = f5edb9198abfbfff0e54fa7f0de7fa2d34184716fffdd34360e955fa1eca0b06c3f268713cf459863de688648e3ce535f1c2851342b90690904de330fd9f94f3 +SHA512 (yq-4.53.4-vendor.tar.bz2) = 6121e2e7f20642452ec63f3f652ca416eedd9004a6dc5c2854f10fb06657a417277bde379e6759f9d940c162ff4b6587aee9869fcf1475f6aa39dfadaa6f59ac diff --git a/yq.spec b/yq.spec index 45fbeae..75bdca6 100644 --- a/yq.spec +++ b/yq.spec @@ -1,19 +1,19 @@ -# Generated by go2rpm 1.17.1 +# Generated by go2rpm 1.19.0 %bcond check 1 # https://github.com/mikefarah/yq %global goipath github.com/mikefarah/yq/v4 -Version: 4.47.1 +Version: 4.53.4 %gometa -L -f 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 # Generated by go-vendor-tools -License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND MPL-2.0 AND Unicode-3.0 URL: %{gourl} Source0: %{gosource} # Generated by go-vendor-tools @@ -23,13 +23,12 @@ Source2: go-vendor-tools.toml BuildRequires: go-vendor-tools %description -Yq is a portable command-line YAML, JSON, XML, CSV, TOML and properties +Yq is a portable command-line YAML, JSON, XML, CSV, TOML, HCL and properties processor. %prep -%goprep -A -%setup -q -T -D -a1 %{forgesetupargs} -%autopatch -p1 +%goprep -p1 +tar -xf %{S:1} %generate_buildrequires %go_vendor_license_buildrequires -c %{S:2} @@ -58,9 +57,9 @@ install -Dpm 0644 %{name}.zsh %{buildroot}%{zsh_completions_dir}/_%{name} %endif %files -f %{go_vendor_license_filelist} -%license vendor/modules.txt -%doc examples CODE_OF_CONDUCT.md CONTRIBUTING.md README.md how-it-works.md -%doc project-words.txt release_instructions.txt release_notes.txt +%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