commit 80f4cc9e2217252e4ccb54f2c7a060dcf95c9011
Merge: e6ff519 8efa624
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 15:43:31 2013 -0500
Merge branch 'master' into f19
Conflicts:
golang.spec
golang-f21-hostname.patch | 13 ++++
golang.spec | 145 ++++++++++++++++++++++++++++++---------------
2 files changed, 111 insertions(+), 47 deletions(-)
---
diff --cc golang.spec
index 0c8030e,b5d46b5..6ecc0ea
--- a/golang.spec
+++ b/golang.spec
@@@ -271,11 -319,14 +319,14 @@@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_s
- Pull upstream patches for BZ#1010271
- Add glibc requirement that got dropped because of meta dep fix
- * Fri Aug 30 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-3
+ * Fri Aug 30 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-4
- fix the libc meta dependency (thanks to vbatts [at]
redhat.com for the fix)
+ * Tue Aug 27 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-3
+ - Revert incorrect merged changelog
+
* Tue Aug 27 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-2
-- This was reverted, just a placeholder changelog entry for bad merge
+- Update spec to fix changelog entries from bad merge
* Tue Aug 20 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-1
- Update to latest upstream