remove handling of gopath dirs from the golang package as they are no longer necessary and will conflict with https://pagure.io/go-rpm-macros/
This commit is contained in:
parent
a562f38c65
commit
af8e815b3f
17
golang.spec
17
golang.spec
|
@ -441,12 +441,6 @@ mkdir -p $RPM_BUILD_ROOT%{goroot}/bin/linux_%{gohostarch}
|
|||
ln -sf %{goroot}/bin/go $RPM_BUILD_ROOT%{goroot}/bin/linux_%{gohostarch}/go
|
||||
ln -sf %{goroot}/bin/gofmt $RPM_BUILD_ROOT%{goroot}/bin/linux_%{gohostarch}/gofmt
|
||||
|
||||
# ensure these exist and are owned
|
||||
mkdir -p $RPM_BUILD_ROOT%{gopath}/src/github.com
|
||||
mkdir -p $RPM_BUILD_ROOT%{gopath}/src/bitbucket.org
|
||||
mkdir -p $RPM_BUILD_ROOT%{gopath}/src/code.google.com/p
|
||||
mkdir -p $RPM_BUILD_ROOT%{gopath}/src/golang.org/x
|
||||
|
||||
# make sure these files exist and point to alternatives
|
||||
rm -f $RPM_BUILD_ROOT%{_bindir}/go
|
||||
ln -sf /etc/alternatives/go $RPM_BUILD_ROOT%{_bindir}/go
|
||||
|
@ -511,17 +505,6 @@ fi
|
|||
%exclude %{goroot}/test/
|
||||
%{goroot}/*
|
||||
|
||||
# ensure directory ownership, so they are cleaned up if empty
|
||||
%dir %{gopath}
|
||||
%dir %{gopath}/src
|
||||
%dir %{gopath}/src/github.com/
|
||||
%dir %{gopath}/src/bitbucket.org/
|
||||
%dir %{gopath}/src/code.google.com/
|
||||
%dir %{gopath}/src/code.google.com/p/
|
||||
%dir %{gopath}/src/golang.org
|
||||
%dir %{gopath}/src/golang.org/x
|
||||
|
||||
|
||||
# gdbinit (for gdb debugging)
|
||||
%{_sysconfdir}/gdbinit.d
|
||||
|
||||
|
|
Loading…
Reference in New Issue