Update to 1.5.1 upstream release

- Resolves: rhbz#2521650

Upstream tag: v1.5.1
Upstream commit: 9803fc95

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -1,2 +1,22 @@
 /xq-0.0.6.tar.gz
 /xq-0.0.7.tar.gz
+/xq-0.0.8.tar.gz
+/xq-1.0.0.tar.gz
+/xq-1.1.0.tar.gz
+/xq-1.1.1.tar.gz
+/xq-1.1.2.tar.gz
+/xq-1.1.3.tar.gz
+/xq-1.1.4.tar.gz
+/xq-1.2.1.tar.gz
+/xq-1.2.2.tar.gz
+/xq-1.2.3.tar.gz
+/xq-1.2.4.tar.gz
+/xq-1.2.5.tar.gz
+/xq-1.3.0.tar.gz
+/xq-1.3.0-vendor.tar.bz2
+/xq-1.4.0.tar.gz
+/xq-1.4.0-vendor.tar.bz2
+/xq-1.5.0.tar.gz
+/xq-1.5.0-vendor.tar.bz2
+/xq-1.5.1.tar.gz
+/xq-1.5.1-vendor.tar.bz2

.packit.yaml

@@ -0,0 +1,31 @@
+---
+downstream_package_name: xq
+upstream_project_url: https://github.com/sibprogrammer/xq
+upstream_tag_template: "v{version}"
+
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      rawhide: {}
+
+  - 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

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.15.0.post1.dev2+g8f2adf816.

go-vendor-tools.toml

@@ -0,0 +1,8 @@
+[archive]
+
+[licensing]
+detector = "askalono"
+[[licensing.licenses]]
+path = "vendor/gopkg.in/yaml.v3/LICENSE"
+sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b"
+expression = "MIT AND (MIT AND Apache-2.0)"

sources

@@ -1,2 +1,2 @@
-SHA512 (xq-0.0.6.tar.gz) = 71831174781f1eb6536ef90cade75a323e1ca52e94adf9204c52c4c6dde1e9e83a5e677e2caafa2cb24a9b582713de5969a6b20a975133d504966fd45661b43a
-SHA512 (xq-0.0.7.tar.gz) = 5411217be4dd7cc6bb5af625d459067fbe97d42e9b204a054024c7736fc3147cbb970b922e52fac70ed93e29cacddc1ab72c573149da8b483828dba973f05253
+SHA512 (xq-1.5.1.tar.gz) = 016b17a6e6e39819c3a309c173ff31a5e0ead2439fdd51766ec0ee5d8c789bc6f7fe65ee2f75252a0d493c594c4aa63f3fb3ea59f6054d4807a6c22d07e8a559
+SHA512 (xq-1.5.1-vendor.tar.bz2) = 6df48b41d621c54328e860f49e9f4579fa5eaaa80262060d126c1a3f179039625f122851d418f0dd695b9e05ae5d3a3a143c6d4eac3011ef19343b1b7ad78356

xq.spec

@@ -1,56 +1,64 @@
-# Generated by go2rpm 1.5.0
-%bcond_without check
+# Generated by go2rpm 1.17.1
+%bcond check 1
 
 # https://github.com/sibprogrammer/xq
 %global goipath         github.com/sibprogrammer/xq
-Version:                0.0.7
+Version:                1.5.1
 
-%gometa
+%gometa -L -f
 
-%global common_description %{expand:
-Command line XML beautifier and content extractor. Similar to jq.}
-
-%global golicenses      LICENSE
-%global godocs          README.md
 
 Name:           xq
 Release:        %autorelease
-Summary:        Command line XML beautifier and content extractor. Similar to jq
+Summary:        Command-line XML and HTML beautifier and content extractor
 
-License:        MIT
+# Generated by go-vendor-tools
+License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT
 URL:            %{gourl}
 Source0:        %{gosource}
+# Generated by go-vendor-tools
+Source1:        %{archivename}-vendor.tar.bz2
+Source2:        go-vendor-tools.toml
+
+BuildRequires:  go-vendor-tools
 
 %description
-%{common_description}
-
-%gopkg
+Command-line XML and HTML beautifier and content extractor.
 
 %prep
-%goprep
+%goprep -A
+%setup -q -T -D -a1 %{forgesetupargs}
+%autopatch -p1
 
 %generate_buildrequires
-%go_generate_buildrequires
+%go_vendor_license_buildrequires -c %{S:2}
 
 %build
+%global gomodulesmode GO111MODULE=on
+export GO_LDFLAGS="-X main.commit=fedora \
+                -X main.version=%{version} \
+                -X main.date=$(date -d "@${SOURCE_DATE_EPOCH}" +%Y-%m-%d)"
 %gobuild -o %{gobuilddir}/bin/xq %{goipath}/
 
 %install
-%gopkginstall
+%go_vendor_license_install -c %{S:2}
 install -m 0755 -vd                     %{buildroot}%{_bindir}
 install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 
-%if %{with check}
+mv ./docs/%{name}.man ./docs/%{name}.1
+install -Dpm 0644 ./docs/%{name}.1 -t %{buildroot}%{_mandir}/man1/
+
 %check
-%gocheck
+%go_vendor_license_check -c %{S:2}
+%if %{with check}
+%gotest ./...
 %endif
 
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/*
-
-%gopkgfiles
+%files -f %{go_vendor_license_filelist}
+%license vendor/modules.txt
+%doc docs README.md
+%{_bindir}/xq
+%{_mandir}/man1/%{name}.1*
 
 %changelog
 %autochangelog