.gitignore

@@ -12,11 +12,3 @@
 /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

@@ -1,31 +1,19 @@
----
-downstream_package_name: xq
+specfile_path: xq.spec
+
+upstream_package_name: xq
 upstream_project_url: https://github.com/sibprogrammer/xq
-upstream_tag_template: "v{version}"
+downstream_package_name: 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
+- job: pull_from_upstream
+  trigger: release
+  dist_git_branches:
+   - fedora-rawhide
+
+- job: koji_build
+  trigger: commit
+  dist_git_branches:
+    - fedora-rawhide

README.packit

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

@@ -1,8 +0,0 @@
-[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 @@
-SHA512 (xq-1.5.1.tar.gz) = 016b17a6e6e39819c3a309c173ff31a5e0ead2439fdd51766ec0ee5d8c789bc6f7fe65ee2f75252a0d493c594c4aa63f3fb3ea59f6054d4807a6c22d07e8a559
-SHA512 (xq-1.5.1-vendor.tar.bz2) = 6df48b41d621c54328e860f49e9f4579fa5eaaa80262060d126c1a3f179039625f122851d418f0dd695b9e05ae5d3a3a143c6d4eac3011ef19343b1b7ad78356
+SHA512 (xq-1.2.5.tar.gz) = 8e5dcb254087c6f043dc8ebb292b49c007048cf0b4928753df3bac57963d80a80220e47a3fed876069620922afd31b12bbf4ad1899629e54f28a1dbc84ec9659

xq.spec

@@ -1,64 +1,79 @@
-# Generated by go2rpm 1.17.1
+# Generated by go2rpm 1.14.0
 %bcond check 1
+%bcond bootstrap 0
+
+%if %{with bootstrap}
+%global debug_package %{nil}
+%endif
+
+%if %{with bootstrap}
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$
+%endif
 
 # https://github.com/sibprogrammer/xq
 %global goipath         github.com/sibprogrammer/xq
-Version:                1.5.1
+Version:                1.2.5
 
 %gometa -L -f
 
+%global common_description %{expand:
+Command-line XML and HTML beautifier and content extractor, similar to jq.}
+
+%global golicenses      LICENSE
+%global godocs          README.md
 
 Name:           xq
 Release:        %autorelease
 Summary:        Command-line XML and HTML beautifier and content extractor
 
-# Generated by go-vendor-tools
-License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT
+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
-Command-line XML and HTML beautifier and content extractor.
+%gopkg
 
 %prep
 %goprep -A
-%setup -q -T -D -a1 %{forgesetupargs}
 %autopatch -p1
 
+%if %{without bootstrap}
 %generate_buildrequires
-%go_vendor_license_buildrequires -c %{S:2}
+%go_generate_buildrequires
+%endif
 
+%if %{without bootstrap}
 %build
-%global gomodulesmode GO111MODULE=on
-export GO_LDFLAGS="-X main.commit=fedora \
+export 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}/
+%endif
 
 %install
-%go_vendor_license_install -c %{S:2}
+%if %{without bootstrap}
 install -m 0755 -vd                     %{buildroot}%{_bindir}
 install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 
 mv ./docs/%{name}.man ./docs/%{name}.1
 install -Dpm 0644 ./docs/%{name}.1 -t %{buildroot}%{_mandir}/man1/
-
-%check
-%go_vendor_license_check -c %{S:2}
-%if %{with check}
-%gotest ./...
 %endif
 
-%files -f %{go_vendor_license_filelist}
-%license vendor/modules.txt
-%doc docs README.md
+%if %{without bootstrap}
+%if %{with check}
+%check
+%gocheck
+%endif
+%endif
+
+%if %{without bootstrap}
+%files
+%license LICENSE
+%doc README.md
 %{_bindir}/xq
 %{_mandir}/man1/%{name}.1*
+%endif
 
 %changelog
 %autochangelog