Merge branch 'f21' into f20

Conflicts:
	.gitignore

golang.spec

@@ -22,6 +22,9 @@
 %global __spec_install_post /usr/lib/rpm/check-rpaths   /usr/lib/rpm/check-buildroot  \
   /usr/lib/rpm/brp-compress
 
+# allow turning this off
+%{!?build_xemacs:%global build_xemacs 1}
+
 # let this match the macros in macros.golang
 %global goroot          /usr/lib/%{name}
 %global gopath          %{_datadir}/gocode
@@ -62,7 +65,6 @@ BuildRequires:  /bin/hostname
 Provides:       go = %{version}-%{release}
 Requires:       golang-bin
 Requires:       golang-src = %{version}-%{release}
-
 Patch0:         golang-1.2-verbose-build.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1038683
@@ -776,64 +778,51 @@ fi
 * Mon Sep 29 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3.2-1
 - update to go1.3.2 (bz1147324)
 
-* Thu Sep 11 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3.1-3
-- patching the tzinfo failure
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Wed Aug 13 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3.1-1
-- update to go1.3.1
-
-* Wed Aug 13 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-11
-- merged a line wrong
-
-* Wed Aug 13 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-10
+* Wed Aug 13 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-22
 - 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
+
+* Wed Aug 13 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-21
+- touch cgo.a regardless
+
+* Wed Aug 13 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-20
+- rpm dependency ordering for %%post
+
+* Tue Aug 12 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-19
+- finally check for a Stale cgo in a %%post
+
+* Tue Aug 12 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-18
+- explicitly list all the files and directories for the packages trees
+
+* Tue Aug 12 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-17
+- explicitly list all the files and directories of the src tree, to preserve timestamps
+
+* Mon Aug 11 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-16
 - touch all the built archives to be the same
 
-* Mon Aug 11 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-9
+* Mon Aug 11 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-15
 - make golang-src 'noarch' again, since that was not a fix, and takes up more space
 
-* Mon Aug 11 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-8
+* Mon Aug 11 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-14
 - update timestamps of source files during %%install bz1099206
 
-* Fri Aug 08 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-7
+* Fri Aug 08 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-13
 - update timestamps of source during %%install bz1099206
 
-* Wed Aug 06 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-6
+* Fri Aug 08 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-12
+- set another version constraint on xemacs due to bz1127518
+
+* Wed Aug 06 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-11
+- set a version constraint on xemacs due to bz1127518
+
+* Wed Aug 06 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-10
 - make the source subpackage arch'ed, instead of noarch
 
-* Mon Jul 21 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-5
-- fix the writing of pax headers
-
-* Tue Jul 15 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-4
+* Tue Jul 15 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-9
 - fix the loading of gdb safe-path. bz981356
 
-* Tue Jul 08 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-3
+* Tue Jul 08 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.2.2-8
 - `go install std` requires gcc, to build cgo. bz1105901, bz1101508
 
-* Mon Jul 07 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-2
-- archive/tar memory allocation improvements
-
-* Thu Jun 19 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3-1
-- update to go1.3
-
-* Fri Jun 13 2014 Vincent Batts <vbatts@fedoraproject.org> - 1.3rc2-1
-- update to go1.3rc2
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3rc1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Jun 03 2014 Vincent Batts <vbatts@redhat.com> 1.3rc1-1
-- update to go1.3rc1
-- new arch file shuffling
-
-* Wed May 21 2014 Vincent Batts <vbatts@redhat.com> 1.3beta2-1
-- update to go1.3beta2
-- no longer provides go-mode for xemacs (emacs only)
-
 * Wed May 21 2014 Vincent Batts <vbatts@redhat.com> 1.2.2-7
 - bz1099206 ghost files are not what is needed