summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Goode <adam@spicenitz.org>2013-05-23 21:57:44 -0400
committerAdam Goode <adam@spicenitz.org>2013-05-23 21:57:44 -0400
commit420db8ccc7e74ff1585d989c5a707ae07d910fb9 (patch)
tree1aa4d6a750aae6558195368ce9a6dc8114b7df45
parentc56eb06f3cc37fda6dd294a1f0b1b507649ca9bd (diff)
downloadgolang-420db8ccc7e74ff1585d989c5a707ae07d910fb9.tar.gz
golang-420db8ccc7e74ff1585d989c5a707ae07d910fb9.tar.xz
golang-420db8ccc7e74ff1585d989c5a707ae07d910fb9.zip
Fix noarch package discrepancies
-rw-r--r--golang.spec14
1 files 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 <adam@spicenitz.org> - 1.1-2
+- Fix noarch package discrepancies
+
* Fri May 24 2013 Adam Goode <adam@spicenitz.org> - 1.1-1
- Initial Fedora release.
- Update to 1.1