diff --git a/.gitignore b/.gitignore index 271eb10..74e5e70 100644 --- a/.gitignore +++ b/.gitignore @@ -310,3 +310,4 @@ /v1.13.0.tar.gz /v1.13.1.tar.gz /v1.13.2.tar.gz +/v1.13.3.tar.gz diff --git a/README.packit b/README.packit index d7c433c..797aefb 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 0.78.2.post2+g81828af. +The file was generated using packit 0.79.0.post2+g93f33d9. diff --git a/skopeo.spec b/skopeo.spec index 1b1a6d8..f49028d 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -7,9 +7,12 @@ %global debug_package %{nil} %endif -# RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we -# set it separately here and do not depend on RHEL 8's go-srpm-macros package. -%if %{defined rhel} && 0%{?rhel} == 8 +# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we +# set it separately here and do not depend on RHEL's go-[s]rpm-macros package +# until that's fixed. +# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328 +# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331 +%if %{defined rhel} %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; %endif @@ -40,7 +43,8 @@ Epoch: %{conditional_epoch} # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.13.2 +Version: 1.13.3 +# The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease %if %{defined golang_arches_future} diff --git a/sources b/sources index a84c6aa..865ce8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.13.2.tar.gz) = 8d321fba452784e3704c058113eb29c76a26e71aa19d0ba2c48fa077e0b74a64a1b8c4ba121d35a1d9ba886a5c28f2e66891e3f592654f2f738d8659443179b3 +SHA512 (v1.13.3.tar.gz) = 3e706b9600ec295b4abe71a5f649535ff2642889331a2958408b4852eb366d8119ec65b1f40c8b2f79b0f28e1079e2b203370422af0cc92e9d3fcf0f83c151e4