diff --git a/.gitignore b/.gitignore index e23e7a5..6bf666a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,3 @@ /delve-1.23.1.tar.gz /delve-1.24.0.tar.gz /delve-1.24.1.tar.gz -/delve-1.24.2.tar.gz -/delve-1.25.0.tar.gz -/delve-1.25.1.tar.gz -/delve-1.25.2.tar.gz -/delve-1.26.0.tar.gz diff --git a/.packit.yml b/.packit.yml index 44c2dbe..ef9dcaa 100644 --- a/.packit.yml +++ b/.packit.yml @@ -14,9 +14,7 @@ actions: jobs: - job: pull_from_upstream trigger: release - dist_git_branches: - rawhide: - fast_forward_merge_into: [fedora-branched] + dist_git_branches: fedora-rawhide - job: koji_build trigger: commit diff --git a/README.packit b/README.packit index 9bb65f0..87210c5 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.13.0.post1.dev2+g84134016c. +The file was generated using packit 1.2.0.post1.dev3+g3adf9afe. diff --git a/delve.spec b/delve.spec index baac82f..e932535 100644 --- a/delve.spec +++ b/delve.spec @@ -1,23 +1,19 @@ # Run tests in check section %bcond_without check -%ifarch ppc64le -%global exp "-tags=exp.linuxppc64le" -%endif - # https://github.com/go-delve/delve %global goipath github.com/go-delve/delve -Version: 1.26.0 +Version: 1.24.1 %global common_description %{expand: -Delve is a debugger for the Go programming language. The goal of the project -is to provide a simple, full featured debugging tool for Go. Delve should be -easy to invoke and easy to use. Chances are if you're using a debugger, things -aren't going your way. With that in mind, Delve should stay out of your way as +Delve is a debugger for the Go programming language. The goal of the project +is to provide a simple, full featured debugging tool for Go. Delve should be +easy to invoke and easy to use. Chances are if you're using a debugger, things +aren't going your way. With that in mind, Delve should stay out of your way as much as possible.} -# Currently Delve only supports x86_64, aarch64, and ppc64le -%global golang_arches x86_64 aarch64 ppc64le +# Currently Delve only supports x86_64 and aarch64 +%global golang_arches x86_64 aarch64 %gometa @@ -76,10 +72,11 @@ tar c -C vendor/ . | tar x -C %{gobuilddir}/src %build echo "=== Start build ===" -%gobuild %{?exp} -o %{gobuilddir}/bin/dlv %{goipath}/cmd/dlv +%gobuild -o %{gobuilddir}/bin/dlv %{goipath}/cmd/dlv echo "=== End build ===" %install +%gopkginstall install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ @@ -88,19 +85,13 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ export GO111MODULE=off export GOPATH=%{buildroot}/%{gopath}:%{gobuilddir}:%{gopath} delvepath=%{buildroot}/%{gopath}/src/%{goipath} -mkdir -p $delvepath -mkdir -p $delvepath/pkg/dwarf/line -mkdir -p $delvepath/pkg/proc/internal cp -r _fixtures $delvepath -cp -r pkg/dwarf $delvepath/pkg/ cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line cp -r pkg/proc/internal/ebpf $delvepath/pkg/proc/internal/ pushd $delvepath echo "=== Start tests ===" -for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts); do - go test %{?exp} ${d} -skip TestGuessSubstitutePath -done +%gotest $(go list ./... | awk '!/(cmd|scripts)/ {print $1}') echo "=== End tests ===" rm -rf $delvepath popd diff --git a/sources b/sources index dd76784..b71893d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (delve-1.26.0.tar.gz) = 1b9d5c7b91bbf1df47c1fdb3553893497defe7a71ae9c7cef160cf15afac391fe77f66b748e028b29aa3456c21cfc079c2751afb788cb065ee8580501d21ad0e +SHA512 (delve-1.24.1.tar.gz) = 7308339af2ef0da14b3d1860d99a602f6fdf3861afd12fd25930c2587bec3099905d3c74ae3d93a193d9aebc77bea4eb4fe3878e3a84c45616ea9926d6b6ba27