From 81887c2abdceed276b466e632185a0d1231e399f Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Wed, 13 Aug 2014 20:04:30 +0000 Subject: [PATCH] fixed a merge --- golang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/golang.spec b/golang.spec index 04c6f07..3ed3c25 100644 --- a/golang.spec +++ b/golang.spec @@ -39,7 +39,7 @@ Name: golang Version: 1.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The Go Programming Language License: BSD @@ -545,10 +545,10 @@ fi %ifarch %{ix86} +%post pkg-bin-linux-386 # since the cgo.a packaged in this rpm will be older than the other archives likely built on the ARM builder, touch -r %{goroot}/pkg/linux_386/runtime.a %{goroot}/pkg/linux_386/runtime/cgo.a -%post pkg-bin-linux-386 %{_sbindir}/update-alternatives --install %{_bindir}/go \ go %{goroot}/bin/linux_386/go 90 \ --slave %{_bindir}/gofmt gofmt %{goroot}/bin/linux_386/gofmt @@ -898,6 +898,9 @@ fi %changelog +* Wed Aug 13 2014 Vincent Batts - 1.3-11 +- merged a line wrong + * Wed Aug 13 2014 Vincent Batts - 1.3-10 - more work to get cgo.a timestamps to line up, due to build-env - explicitly list all the files and directories for the source and packages trees