From f3b80013ec956be6572a075beccdcfe90d36046e Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 23 Feb 2023 12:41:19 -0500 Subject: [PATCH] Import rpm: 3199389259ddb4e6b1237e7cadefeeb72c66d4a9 --- .gitignore | 4 +- golang-github-cpuguy83-go-md2man.spec | 206 +++++++------------------- sources | 4 +- 3 files changed, 62 insertions(+), 152 deletions(-) diff --git a/.gitignore b/.gitignore index 11825c3..5959fc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -SOURCES/go-md2man-1d903dc.tar.gz +SOURCES/blackfriday-77efab5.tar.gz +SOURCES/go-md2man-71acacd.tar.gz +SOURCES/sanitized_anchor_name-8e87604.tar.gz diff --git a/golang-github-cpuguy83-go-md2man.spec b/golang-github-cpuguy83-go-md2man.spec index c866416..44735f4 100644 --- a/golang-github-cpuguy83-go-md2man.spec +++ b/golang-github-cpuguy83-go-md2man.spec @@ -1,188 +1,94 @@ -%global with_bundled 1 -%global with_debug 0 - -%if 0%{?with_debug} -%global _find_debuginfo_dwz_opts %{nil} -%global _dwz_low_mem_die_limit 0 -%else %global debug_package %{nil} -%endif - -%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 %{?**}; - %global provider github %global provider_tld com %global project cpuguy83 %global repo go-md2man -# https://github.com/cpuguy83/go-md2man -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 1d903dcb749992f3741d744c0f8376b4bd7eb3e1 +%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%global commit 71acacd42f85e5e82f70a55327789582a5200a90 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global san_commit 8e87604bec3c645a4eeaee97dfec9f25811ff20d +%global san_shortcommit %(c=%{san_commit}; echo ${c:0:7}) +%global san_repo sanitized_anchor_name + +%global bl_commit 77efab57b2f74dd3f9051c79752b2e8995c8b789 +%global bl_shortcommit %(c=%{bl_commit}; echo ${c:0:7}) +%global bl_repo blackfriday + Name: golang-%{provider}-%{project}-%{repo} -Version: 1.0.7 -Release: 13%{?dist} +Version: 1.0.4 +Release: 4%{?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 %{arm} %{ix86} -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -BuildRequires: git -Provides: %{repo} = %{version}-%{release} +Source1: https://github.com/shurcooL/%{san_repo}/archive/%{san_commit}/%{san_repo}-%{san_shortcommit}.tar.gz +Source2: https://github.com/russross/%{bl_repo}/archive/%{bl_commit}/%{bl_repo}-%{bl_shortcommit}.tar.gz +Provides: %{repo} = %{version}-%{release} +%if 0%{?centos} || 0%{?fedora} +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x} +%else +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:x86_64 %{arm} aarch64 ppc64le s390x} +%endif +BuildRequires: golang >= 1.2.1-3 %description %{repo} is a golang tool using blackfriday to process markdown into manpages. -# Go Toolset -%if 0%{?rhel} > 7 -%{?enable_gotoolset110} -%endif - %prep -%autosetup -Sgit -n %{repo}-%{commit} +%setup -q -n %{san_repo}-%{san_commit} -T -b 1 +%setup -q -n %{bl_repo}-%{bl_commit} -T -b 2 +%setup -qn %{repo}-%{commit} + +mkdir -p Godeps/_workspace/src/github.com/shurcooL/%{san_repo} +cp -r ../%{san_repo}-%{san_commit}/* Godeps/_workspace/src/github.com/shurcooL/%{san_repo}/. +mkdir -p Godeps/_workspace/src/github.com/russross/%{bl_repo} +cp -r ../%{bl_repo}-%{bl_commit}/* Godeps/_workspace/src/github.com/russross/%{bl_repo}/. %build -ln -s vendor src -mkdir -p src/%{provider}.%{provider_tld}/%{project} -ln -s $(pwd) src/%{import_path} -export GOPATH=$(pwd) -GOPATH=$GOPATH %gobuild -o bin/go-md2man %{import_path} +mkdir -p _build/src/%{provider}.%{provider_tld}/%{project} +ln -s $(pwd) ./_build/src/%{import_path} + +export GOPATH=$(pwd)/_build:$(pwd)/Godeps/_workspace + +pushd $(pwd)/_build/src +go build -v %{import_path} +popd %install # install go-md2man binary install -d %{buildroot}%{_bindir} -install -p -m 755 bin/%{repo} %{buildroot}%{_bindir} -# generate man page -install -d -p %{buildroot}%{_mandir}/man1 -bin/go-md2man -in=go-md2man.1.md -out=go-md2man.1 -install -p -m 644 go-md2man.1 %{buildroot}%{_mandir}/man1 - -%check - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} +install -p -m 755 ./_build/src/%{repo} %{buildroot}%{_bindir} %files -%license LICENSE.md %doc README.md %{_bindir}/%{repo} -%{_mandir}/man1/* %changelog -* Wed Nov 20 2019 bstinson@centosproject.org - 1.0.7-13 -- Build on i686 +* Wed Mar 15 2017 Lokesh Mandvekar - 1.0.4-4 +- Resolves: #1344553 - build only for go_arches +- update ambiguous changelog in previous entry +- update go_arches definition -* Mon Aug 06 2018 Lokesh Mandvekar - 1.0.7-11 -- disable i686 temporarily +* Wed Mar 15 2017 Lokesh Mandvekar - 1.0.4-3 +- Resolves: #1344553 - build for all available arches (previous build didn't +fix it) -* Mon Aug 06 2018 Lokesh Mandvekar - 1.0.7-10 -- use both go-compilers and go-toolset on all rhel arches +* Tue Mar 14 2017 Lokesh Mandvekar - 1.0.4-2 +- Resolves: #1344553 - build for 7.4 -* Mon Aug 06 2018 Lokesh Mandvekar - 1.0.7-9 -- update distro conditionals and go deps - -* Mon Aug 06 2018 Lokesh Mandvekar - 1.0.7-8 -- go-toolset and go-compiler needed by all arches - -* Mon Aug 06 2018 Lokesh Mandvekar - 1.0.7-7 -- use go-compiler for i686 and non-rhel-8 - -* Mon Aug 06 2018 Lokesh Mandvekar - 1.0.7-6 -- re-enable all go_arches - -* Mon Aug 06 2018 Lokesh Mandvekar - 1.0.7-5 -- temp disable i686 - -* Mon Aug 06 2018 Lokesh Mandvekar - 1.0.7-4 -- use go-toolset-1.10-golang for rhel8 - -* Tue Jul 31 2018 Lokesh Mandvekar - 1.0.7-3 -- build with new scl macros for go-toolset - -* Mon Jun 25 2018 Lokesh Mandvekar - 1.0.7-2 -- remove devel and unittest packages - unused -- make debuginfo package delve debugger friendly -- build with bundled deps (no need for russross/blackfriday rpm) -- don't execute %%check (doesn't work) -- add go-toolset deps and conditionals - -* Tue Sep 19 2017 Jan Chaloupka - 1.0.7-1 -- Bump to upstream 1d903dcb749992f3741d744c0f8376b4bd7eb3e1 - related: #1222796 - -* Wed Aug 02 2017 Fedora Release Engineering - 1.0.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.0.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Mar 14 2017 Jan Chaloupka - 1.0.4-7 -- Bump to upstream a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa - related: #1222796 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.0.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jul 21 2016 Fedora Release Engineering - 1.0.4-5 -- https://fedoraproject.org/wiki/Changes/golang1.7 - -* Sun Mar 06 2016 jchaloup - 1.0.4-4 -- Update list of provided packages - resolves: #1222796 - -* Mon Feb 22 2016 Fedora Release Engineering - 1.0.4-3 -- https://fedoraproject.org/wiki/Changes/golang1.6 - -* Wed Feb 03 2016 Fedora Release Engineering - 1.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Dec 14 2015 jchaloup - 1.0.4-1 +* Tue Dec 15 2015 jchaloup - 1.0.4-1 - Rebase to 1.0.4 - resolves: #1291379 + Deps import separatelly, not in one tarball + resolves: #1291380 -* Thu Sep 10 2015 jchaloup - 1-13 -- Generate man page as well - related: #1222796 - -* Sun Aug 30 2015 jchaloup - 1-12 -- Change deps on compiler(go-compiler) -- Update %%build, %%test and main section accordingaly - related: #1222796 - -* Sat Aug 29 2015 jchaloup - 1-11 -- Reduce build section after update of go-srpm-macros -- BUILD_ID for debug is needed only for golang compiler - related: #1222796 - -* Tue Aug 25 2015 jchaloup - 1-10 -- Provide devel package on rhel7 - related: #1222796 - -* Thu Aug 20 2015 jchaloup - 1-9 -- Update spec file to spec-2.0 - related: #1222796 - -* Mon Jul 20 2015 jchaloup - 1-8 -- Add with_* macros - -* Wed Jun 17 2015 Fedora Release Engineering - 1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue May 19 2015 jchaloup - 1-6 -- Remove runtime deps of devel on golang -- Polish spec file - related: #1222796 - -* Sun May 17 2015 jchaloup - 1-5 -- Add debug info -- Add license -- Update spec file to build on secondary architectures as well - related: #1222796 +* Wed Jun 17 2015 jchaloup - 1-5 +- Update the spec file for RHEL +- Remove devel subpackage +- Bundle github.com/russross/blackfriday and github.com/shurcooL/sanitized_anchor_name into tarball +- Use bundled dependencies to build md2man + resolves: #1211312 * Wed Feb 25 2015 jchaloup - 1-4 - Bump to upstream 2831f11f66ff4008f10e2cd7ed9a85e3d3fc2bed diff --git a/sources b/sources index 6b56edd..6dc5705 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (go-md2man-1d903dc.tar.gz) = 15030baf29445de9257d0bde894e567f3f99a09b933ff7bd0176c2005114a017fcb322ca42842cd07b15bc8104effe087edf19247baab9d3a84ccbff818f18cc +SHA1 (blackfriday-77efab5.tar.gz) = b82be9878c8a45e316049cfdab82af05fb4779f9 +SHA1 (go-md2man-71acacd.tar.gz) = 1ce2973441c1113210623c50e9b1d514ae0b0396 +SHA1 (sanitized_anchor_name-8e87604.tar.gz) = f030637c15161d0c27d683d0e4c0eb5ececf08dc