From a47b065139a9f2db4e79cbc6e22adda8d7f91c85 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 14 Dec 2021 15:52:49 +0000 Subject: [PATCH] CentOS fixes --- SPECS/golang-github-cpuguy83-go-md2man.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/SPECS/golang-github-cpuguy83-go-md2man.spec b/SPECS/golang-github-cpuguy83-go-md2man.spec index ba45235..c866416 100644 --- a/SPECS/golang-github-cpuguy83-go-md2man.spec +++ b/SPECS/golang-github-cpuguy83-go-md2man.spec @@ -1,5 +1,5 @@ %global with_bundled 1 -%global with_debug 1 +%global with_debug 0 %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} @@ -8,12 +8,7 @@ %global debug_package %{nil} %endif -%if 0%{?rhel} > 7 && ! 0%{?fedora} -%define gobuild(o:) \ -scl enable go-toolset-1.10 -- go build -buildmode pie -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; -%else %define gobuild(o:) go build -buildmode pie -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; -%endif # distro %global provider github %global provider_tld com @@ -27,18 +22,15 @@ scl enable go-toolset-1.10 -- go build -buildmode pie -compiler gc -tags=rpm_cra Name: golang-%{provider}-%{project}-%{repo} Version: 1.0.7 -Release: 11%{?dist} +Release: 13%{?dist} Summary: Process markdown into manpages License: MIT URL: https://%{import_path} Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 %%{arm}} -ExclusiveArch: aarch64 x86_64 ppc64le s390x +ExclusiveArch: aarch64 x86_64 ppc64le s390x %{arm} %{ix86} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -%if 0%{?rhel} > 7 -BuildRequires: go-toolset-1.10-golang -%endif # rhel8 BuildRequires: git Provides: %{repo} = %{version}-%{release} @@ -82,6 +74,9 @@ install -p -m 644 go-md2man.1 %{buildroot}%{_mandir}/man1 %{_mandir}/man1/* %changelog +* Wed Nov 20 2019 bstinson@centosproject.org - 1.0.7-13 +- Build on i686 + * Mon Aug 06 2018 Lokesh Mandvekar - 1.0.7-11 - disable i686 temporarily