From 75add143443d95b02a3d21949733b0e495d6e9f9 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 23:18:56 +0100 Subject: [PATCH] rename go and go-fmt to [-pie] for cohexistence woth gcc-go [release 1.11-2mamba;Mon Sep 10 2018] --- go.spec | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/go.spec b/go.spec index 4579136..97dd316 100644 --- a/go.spec +++ b/go.spec @@ -1,7 +1,7 @@ -#% define with_pie 1 +%define with_pie 1 Name: go Version: 1.11 -Release: 1mamba +Release: 2mamba Summary: The Go programming language Group: Applications/Development Vendor: openmamba @@ -14,17 +14,15 @@ Patch0: go-1.10.1-default-buildmode-pie.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: ldconfig -BuildRequires: libperl -BuildRequires: perl-devel ## AUTOBUILDREQ-END BuildRequires: gcc-go >= 8.1.0 Provides: go -%if "%{with_pie}" == "1" -Conflicts: go -%else -Conflicts: go-pie -%endif +Provides: go-pie +#%if "%{with_pie}" == "1" +#Conflicts: go +#%else +#Conflicts: go-pie +#%endif BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -86,8 +84,8 @@ install -d %{buildroot}{%{_bindir},%{_libdir}/go,%{_docdir}/go} cp -a bin pkg src lib misc %{buildroot}%{_libdir}/go cp -r doc/* %{buildroot}%{_docdir}/go -ln -sf %{_libdir}/go/bin/go %{buildroot}%{_bindir}/go -ln -sf %{_libdir}/go/bin/gofmt %{buildroot}%{_bindir}/gofmt +ln -sf %{_libdir}/go/bin/go %{buildroot}%{_bindir}/go-pie +ln -sf %{_libdir}/go/bin/gofmt %{buildroot}%{_bindir}/gofmt-pie ln -sf %{_docdir}/go %{buildroot}%{_libdir}/go/doc install -Dm644 LICENSE %{buildroot}%{_datadir}/licenses/go/LICENSE @@ -106,8 +104,8 @@ rm -rf %{buildroot}%{_libdir}/go/src/*.rc %files %endif %defattr(-,root,root) -%{_bindir}/go -%{_bindir}/gofmt +%{_bindir}/go-pie +%{_bindir}/gofmt-pie %dir %{_libdir}/go %{_libdir}/go/* %dir %{_datadir}/doc/go @@ -116,6 +114,9 @@ rm -rf %{buildroot}%{_libdir}/go/src/*.rc #%doc README.md %changelog +* Mon Sep 10 2018 Silvan Calarco 1.11-2mamba +- rename go and go-fmt to [-pie] for cohexistence woth gcc-go + * Tue Sep 04 2018 Automatic Build System 1.11-1mamba - automatic version update by autodist