Merge branch 'f20' into f19

This commit is contained in:
Vincent Batts 2014-08-09 03:21:18 +00:00
commit 6ceac592dd
1 changed files with 6 additions and 1 deletions

View File

@ -39,7 +39,7 @@
Name: golang
Version: 1.2.2
Release: 12%{?dist}
Release: 13%{?dist}
Summary: The Go Programming Language
License: BSD
@ -476,6 +476,8 @@ mkdir -p $RPM_BUILD_ROOT%{goroot}
cp -apv api bin doc favicon.ico include lib pkg robots.txt src misc VERSION \
$RPM_BUILD_ROOT%{goroot}
find $RPM_BUILD_ROOT%{goroot}/src -type d -exec touch -r $RPM_BUILD_ROOT%{goroot}/VERSION "{}" \;
# remove the unnecessary zoneinfo file (Go will always use the system one first)
rm -rfv $RPM_BUILD_ROOT%{goroot}/lib/time
@ -886,6 +888,9 @@ fi
%changelog
* Fri Aug 08 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-13
- update timestamps of source during %%install bz1099206
* Fri Aug 08 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-12
- set another version constraint on xemacs due to bz1127518