.gitignore

@@ -1,7 +1 @@
 /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

.packit.yaml

@@ -1,34 +0,0 @@
----
-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

go-vendor-tools.toml

@@ -1,8 +0,0 @@
-[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"

sources

@@ -1,2 +1 @@
-SHA512 (yq-4.53.4.tar.gz) = f5edb9198abfbfff0e54fa7f0de7fa2d34184716fffdd34360e955fa1eca0b06c3f268713cf459863de688648e3ce535f1c2851342b90690904de330fd9f94f3
-SHA512 (yq-4.53.4-vendor.tar.bz2) = 6121e2e7f20642452ec63f3f652ca416eedd9004a6dc5c2854f10fb06657a417277bde379e6759f9d940c162ff4b6587aee9869fcf1475f6aa39dfadaa6f59ac
+SHA512 (yq-4.43.1.tar.gz) = a3bb594421811db613118af5ba002e08ccb4b76a63ddf428bbdd4926cf8614217d67f47bfa4ad2c87361a96ade1841fde656fcf9ed700a8994333d61b9a80a8d

yq.spec

@@ -1,70 +1,57 @@
-# Generated by go2rpm 1.19.0
-%bcond check 1
+# Generated by go2rpm 1.11.1
+%bcond_without check
 
 # https://github.com/mikefarah/yq
 %global goipath         github.com/mikefarah/yq/v4
-Version:                4.53.4
+Version:                4.43.1
 
 %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, HCL  and properties processor
+Summary:        Yq is a portable command-line YAML, JSON, XML, CSV, TOML  and properties processor
 
-# 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
+License:        MIT
 URL:            %{gourl}
-Source0:        %{gosource}
-# Generated by go-vendor-tools
-Source1:        %{archivename}-vendor.tar.bz2
-Source2:        go-vendor-tools.toml
+Source:         %{gosource}
 
-BuildRequires:  go-vendor-tools
+%description %{common_description}
 
-%description
-Yq is a portable command-line YAML, JSON, XML, CSV, TOML, HCL  and properties
-processor.
+%gopkg
 
 %prep
-%goprep -p1
-tar -xf %{S:1}
+%goprep -A
+%autopatch -p1
 
 %generate_buildrequires
-%go_vendor_license_buildrequires -c %{S:2}
+%go_generate_buildrequires
 
 %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}/
 
-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
-%go_vendor_license_check -c %{S:2}
 %if %{with check}
-%gotest ./...
+%check
+%gocheck
 %endif
 
-%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
+%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
 %{_bindir}/yq
-%{bash_completions_dir}/%{name}
-%{fish_completions_dir}/%{name}.fish
-%{zsh_completions_dir}/_%{name}
-
 
 %changelog
 %autochangelog