From bf6445f5fde056f0a41738c0b9797deeb7062b6f Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Mar 04 2018 19:06:08 +0000 Subject: Re-implement bash part of the macros --- diff --git a/.gitignore b/.gitignore index 21198d8..c35e654 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/symbols-extractor-e16a050.tar.gz -/go-macros-2ece288.tar.gz -/symbols-extractor-4ece600.tar.gz -/go-macros-250bb21.tar.gz +/symbols-extractor-20d2985.tar.gz +/go-macros-290ffed.tar.gz diff --git a/go-compilers.spec b/go-compilers.spec index 9317481..d918e17 100644 --- a/go-compilers.spec +++ b/go-compilers.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} -%global commit 4ece60002fcc0e011a57b4453834f1a8f0039654 +%global commit 20d2985c28f1ebbe1dc337fd5415243f119baada %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global m_commit 250bb2125e4aa8f86396cfaadba7854ac44bf921 +%global m_commit 290ffed574a6a4a57354173ca982426f95c7ce09 %global m_shortcommit %(c=%{m_commit}; echo ${c:0:7}) Name: go-compilers Version: 1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Go language compilers for various architectures Group: Development/Tools License: GPLv3+ @@ -73,12 +73,17 @@ popd %install %ifarch %{golang_arches} -install -m 644 -D rpm/macros.d/macros.golang-compiler %{buildroot}%{_rpmconfigdir}/macros.d/macros.golang-compiler +# executables +install -m 755 -D bin/go-rpm-integration %{buildroot}%{_bindir}/go-rpm-integration +install -m 755 -D rpm/gobundled.prov %{buildroot}%{_rpmconfigdir}/gobundled.prov +install -m 755 -D rpm/gosymlink.deps %{buildroot}%{_rpmconfigdir}/gosymlink.deps +# macros +install -m 644 -D rpm/macros.d/macros.go-compilers-golang %{buildroot}%{_rpmconfigdir}/macros.d/macros.go-compilers-golang install -m 644 -D rpm/macros.d/macros.go-rpm %{buildroot}%{_rpmconfigdir}/macros.d/macros.go-rpm -install -m 755 -D rpm/go.prov %{buildroot}%{_rpmconfigdir}/go.prov -install -m 755 -D rpm/go.req %{buildroot}%{_rpmconfigdir}/go.req -install -m 755 -D rpm/goinstall.sh %{buildroot}%{_rpmconfigdir}/goinstall.sh +# attrs install -m 644 -D rpm/fileattrs/go.attr %{buildroot}%{_rpmconfigdir}/fileattrs/go.attr +install -m 644 -D rpm/fileattrs/gobundled.attr %{buildroot}%{_rpmconfigdir}/fileattrs/gobundled.attr +install -m 644 -D rpm/fileattrs/gosymlink.attr %{buildroot}%{_rpmconfigdir}/fileattrs/gosymlink.attr pushd ../symbols-extractor-%{commit} install -D -p -m 0755 golist %{buildroot}%{_bindir}/golist @@ -86,26 +91,31 @@ popd %endif %ifarch %{gccgo_arches} -install -m 644 -D rpm/macros.d/macros.gcc-go-compiler %{buildroot}%{_rpmconfigdir}/macros.d/macros.gcc-go-compiler +install -m 644 -D rpm/macros.d/macros.go-compilers-gcc %{buildroot}%{_rpmconfigdir}/macros.d/macros.go-compilers-gcc %endif %ifarch %{golang_arches} %files golang-compiler -%{_rpmconfigdir}/macros.d/macros.golang-compiler +%{_rpmconfigdir}/macros.d/macros.go-compilers-golang %{_rpmconfigdir}/macros.d/macros.go-rpm -%{_rpmconfigdir}/go.prov -%{_rpmconfigdir}/go.req -%{_rpmconfigdir}/goinstall.sh +%{_rpmconfigdir}/gobundled.prov +%{_rpmconfigdir}/gosymlink.deps %{_rpmconfigdir}/fileattrs/go.attr +%{_rpmconfigdir}/fileattrs/gobundled.attr +%{_rpmconfigdir}/fileattrs/gosymlink.attr %{_bindir}/golist +%{_bindir}/go-rpm-integration %endif %ifarch %{gccgo_arches} %files gcc-go-compiler -%{_rpmconfigdir}/macros.d/macros.gcc-go-compiler +%{_rpmconfigdir}/macros.d/macros.go-compilers-gcc %endif %changelog +* Sun Mar 04 2018 Jan Chaloupka - 1-25 +- Re-implement bash part of the macros + * Thu Mar 01 2018 Jan Chaloupka - 1-24 - https://github.com/gofed/go-macros/issues/6: golist --provided should accept attribute decorators - https://github.com/gofed/go-macros/issues/5: The Go utilities used by the macros should accept arbitrary numbers of flags diff --git a/sources b/sources index a68c895..05fa3c5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (symbols-extractor-4ece600.tar.gz) = f4a3a71ba4a021fe4537f24fb1b952634865edb114f88ca062f1539eb8a726abaf1b2c0752b48a1681caa77cf5d3d8f106d9f79f7aebbadfc3bbcb0c1e6478b1 -SHA512 (go-macros-250bb21.tar.gz) = 5056a9546419d8cb72d1ad4392a289bf7e0850c0d4c9806ab3e4063627963b040b1eee32fb74d3658977b286c087180b7dd09d1fed511242b28a3c0313d00bd4 +SHA512 (symbols-extractor-20d2985.tar.gz) = aa32bcba591a244dec2db06c66b1734c275e6288f809ad9aaa224ff0f591046941efcf813f3435e094b741b4e2fb0f16cfccb4f1f4ccb6ca489a25fc209eeda7 +SHA512 (go-macros-290ffed.tar.gz) = 15c625d7011417cc4bfd4708e2909240d7f7e25c02d26b9c7ffcae5a084760cc51ba224acfc2896a1fca5549282549377a4a37281c82ae2568727ead8feed75d