From 420db8ccc7e74ff1585d989c5a707ae07d910fb9 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Thu, 23 May 2013 21:57:44 -0400 Subject: [PATCH] Fix noarch package discrepancies --- golang.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/golang.spec b/golang.spec index 929ed42..e284a94 100644 --- a/golang.spec +++ b/golang.spec @@ -7,7 +7,7 @@ Name: golang Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Go Programming Language License: BSD @@ -74,6 +74,11 @@ BuildArch: noarch # increase verbosity of build %patch0 -p1 +# make a copy before building to let us avoid generated src files in docs +pushd .. +cp -av go go-nogenerated +popd + %build # create a gcc wrapper to allow us to build with our own flags @@ -140,9 +145,11 @@ rm -rfv $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/time # remove the doc Makefile rm -rfv $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/Makefile -# install all sources, used by godoc +# install all non-generated sources, used by godoc +pushd ../go-nogenerated mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/src cp -av src/pkg $RPM_BUILD_ROOT%{_datadir}/%{name}/src +popd # remove testdata, tests, and non-go files: this is all we need for godoc pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/src/pkg @@ -274,6 +281,9 @@ cp -av misc/zsh/go $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions %changelog +* Fri May 24 2013 Adam Goode - 1.1-2 +- Fix noarch package discrepancies + * Fri May 24 2013 Adam Goode - 1.1-1 - Initial Fedora release. - Update to 1.1