From 7e281b5aa6d47c3aa83cd46de93222d0ea8b59c8 Mon Sep 17 00:00:00 2001
From: Adam Goode <adam@spicenitz.org>
Date: Mon, 17 Jun 2013 00:29:13 -0400
Subject: Hopefully really fix #973842

- Fix update from pre-1.1.1 (#974840)
---
 golang.spec | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/golang.spec b/golang.spec
index 2b8e0b1..e6d6f25 100644
--- a/golang.spec
+++ b/golang.spec
@@ -14,7 +14,7 @@
 
 Name:		golang
 Version:	1.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The Go Programming Language
 
 License:	BSD
@@ -76,6 +76,14 @@ BuildArch:	noarch
 %{summary}.
 
 
+# Workaround old RPM bug of symlink-replaced-with-dir failure
+%pretrans
+if [ -h %{_libdir}/%{name}/src ]; then
+   rm -v %{_libdir}/%{name}/src
+   mkdir %{_libdir}/%{name}/src
+fi
+
+
 %prep
 %setup -q -n go
 
@@ -204,9 +212,13 @@ rm $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/readme.txt
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
 cp -av misc/zsh/go $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
 
-# fix all the symlinks
+# relativize the symlinks
 symlinks -c -s -r $RPM_BUILD_ROOT%{_libdir}
 
+# ensure all binaries have a later time than all sources (really fix #973842)
+touch $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/go
+find $RPM_BUILD_ROOT%{_libdir}/%{name} -type f -print0 | xargs -0 touch -r $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/go
+
 
 %files
 %doc AUTHORS CONTRIBUTORS LICENSE PATENTS VERSION
@@ -229,6 +241,8 @@ symlinks -c -s -r $RPM_BUILD_ROOT%{_libdir}
 %{_libdir}/%{name}/include
 %{_libdir}/%{name}/lib
 %{_libdir}/%{name}/robots.txt
+
+# src (directory of symlinks to datadir + arch-specific generated files)
 %{_libdir}/%{name}/src
 
 
@@ -264,6 +278,10 @@ symlinks -c -s -r $RPM_BUILD_ROOT%{_libdir}
 
 
 %changelog
+* Mon Jun 17 2013 Adam Goode <adam@spicenitz.org> - 1.1.1-2
+- Hopefully really fix #973842
+- Fix update from pre-1.1.1 (#974840)
+
 * Thu Jun 13 2013 Adam Goode <adam@spicenitz.org> - 1.1.1-1
 - Update to 1.1.1
 - Fix basically useless package (#973842)
-- 
cgit