rpms/golang
7
0
Fork 0
Code Issues Pull Requests Releases Activity

seperate the godoc into its own package again, but let it be installed

Browse Source 
by the golang dep on of /usr/bin/godoc
This will allow for the transition to using the godoc from go.tools
This commit is contained in:
Vincent Batts 2013-11-20 17:32:45 -05:00
parent 355d9b0c2a
commit d8b5074c45
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
golang.spec
View File

@ -25,7 +25,7 @@
Name: golang Name: golang
Version: 1.1.2 Version: 1.1.2
Release: 5%{?dist} Release: 6%{?dist}
Summary: The Go Programming Language Summary: The Go Programming Language
License: BSD License: BSD
@ -37,15 +37,18 @@ BuildRequires: emacs xemacs xemacs-packages-extra
# We strip the meta dependency, but go does require glibc. # We strip the meta dependency, but go does require glibc.
# This is an odd issue, still looking for a better fix. # This is an odd issue, still looking for a better fix.
Requires: glibc Requires: glibc
# `go doc ...` calls out to godoc in $PATH
# while godoc is in go1.1, it is moved to go.tools in go1.2
Requires: /usr/bin/godoc
Patch0: golang-1.1-verbose-build.patch Patch0: golang-1.1-verbose-build.patch
Patch10: golang-1.1.2-long-links.patch Patch10: golang-1.1.2-long-links.patch
Patch11: golang-1.1.2-ustar-split.patch Patch11: golang-1.1.2-ustar-split.patch
# Having godoc and the documentation separate was broken # Having documentation separate was broken
Obsoletes: %{name}-godoc < 1.1-4
Obsoletes: %{name}-docs < 1.1-4 Obsoletes: %{name}-docs < 1.1-4
# RPM can't handle symlink -> dir with subpackages, so merge back # RPM can't handle symlink -> dir with subpackages, so merge back
@ -60,6 +63,11 @@ Source101: golang-prelink.conf
%{summary}. %{summary}.
%package godoc
Summary: the Go Programming Language documentation tool
%description godoc
%{summary}.
# Restore this package if RPM gets fixed (bug #975909) # Restore this package if RPM gets fixed (bug #975909)
#%package data #%package data
#Summary: Required architecture-independent files for Go #Summary: Required architecture-independent files for Go
@ -183,10 +191,10 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/%{name}/lib/time
# remove the doc Makefile # remove the doc Makefile
rm -rfv $RPM_BUILD_ROOT%{_libdir}/%{name}/doc/Makefile rm -rfv $RPM_BUILD_ROOT%{_libdir}/%{name}/doc/Makefile
# add symlinks for binaries # put binaries to bindir
pushd $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir}
for z in $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/* for z in $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/*
do ln -s %{_libdir}/%{name}/bin/$(basename $z) do mv $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/$(basename $z) .
done done
popd popd
@ -227,15 +235,17 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d
cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
%files godoc
%{_bindir}/godoc
%files %files
%doc AUTHORS CONTRIBUTORS LICENSE PATENTS VERSION %doc AUTHORS CONTRIBUTORS LICENSE PATENTS VERSION
# go files # go files
%{_libdir}/%{name} %{_libdir}/%{name}
# bin symlinks # binary executables
%{_bindir}/go %{_bindir}/go
%{_bindir}/godoc
%{_bindir}/gofmt %{_bindir}/gofmt
# autocomplete # autocomplete
@ -267,6 +277,10 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
%changelog %changelog
* Wed Nov 20 2013 Vincent Batts <vbatts@redhat.com> - 1.1.2-6
- don't symlink /usr/bin out to ../lib..., move the file
- seperate out godoc, to accomodate the go.tools godoc
* Fri Sep 20 2013 Adam Miller <maxamillion@fedoraproject.org> - 1.1.2-5 * Fri Sep 20 2013 Adam Miller <maxamillion@fedoraproject.org> - 1.1.2-5
- Pull upstream patches for BZ#1010271 - Pull upstream patches for BZ#1010271
- Add glibc requirement that got dropped because of meta dep fix - Add glibc requirement that got dropped because of meta dep fix