Fix ExclusiveArch

i9
Arkady L. Shane 10 months ago
parent 99cea58225
commit 9547160cbb
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -33,7 +33,7 @@ Version: 3.2.0
%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**};
%endif %endif
ExclusiveArch: %{golang_arches} %{gccgo_arches} i686 ExclusiveArch: %{golang_arches} %{gccgo_arches}
Name: go-rpm-macros Name: go-rpm-macros
Release: 2%{?dist}.inferit Release: 2%{?dist}.inferit
@ -91,6 +91,7 @@ pull it in for Go packages only.
%package -n go-srpm-macros %package -n go-srpm-macros
Summary: Source-stage rpm automation for Go packages Summary: Source-stage rpm automation for Go packages
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{golang_arches} %{gccgo_arches} i686
Requires: redhat-rpm-config Requires: redhat-rpm-config
%description -n go-srpm-macros %description -n go-srpm-macros
@ -114,6 +115,7 @@ This package contains the basic directory layout used by Go packages.
Summary: RPM spec templates for Go packages Summary: RPM spec templates for Go packages
License: MIT License: MIT
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{golang_arches} %{gccgo_arches} i686
Requires: go-rpm-macros = %{version}-%{release} Requires: go-rpm-macros = %{version}-%{release}
#https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51 #https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51
#Requires: redhat-rpm-templates #Requires: redhat-rpm-templates

Loading…
Cancel
Save