[golang/el6: 13/13] Merge branch 'master' into el6
by Vincent Batts
commit adb88d9b5d6f8466cf7d867d89ab36410bac9639
Merge: 866e8dc 8efa624
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 14:11:32 2013 -0500
Merge branch 'master' into el6
---
10 years, 6 months
[golang/el6: 12/13] fixed the date
by Vincent Batts
commit 8efa6246fb510bdb66067798cb55a75f8a9dd169
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 14:11:26 2013 -0500
fixed the date
golang.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index db45e93..b5d46b5 100644
--- a/golang.spec
+++ b/golang.spec
@@ -307,7 +307,7 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
%changelog
-* Thu Nov 20 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-7
+* Thu Nov 21 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-7
- patch tests for testing on rawhide
- let the same spec work for rhel and fedora
10 years, 6 months
[golang/el6: 11/13] Merge branch 'master' into el6
by Vincent Batts
commit 866e8dcc934888e3a72cf89c939eca22fd0dad5d
Merge: 8856b2e 6c39c37
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 14:10:50 2013 -0500
Merge branch 'master' into el6
Conflicts:
golang.spec
golang.spec | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
10 years, 6 months
[golang/el6: 10/13] vim-filesystem conditional for fedora
by Vincent Batts
commit 6c39c372e6f2417aedd8a53d95d66a073028a577
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 14:09:08 2013 -0500
vim-filesystem conditional for fedora
golang.spec | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 67958c8..db45e93 100644
--- a/golang.spec
+++ b/golang.spec
@@ -92,7 +92,10 @@ Summary: The Go Programming Language documentation tool
%package vim
Summary: Vim plugins for Go
+# xemacs on fedora only
+%if 0%{?fedora} >= 0
Requires: vim-filesystem
+%endif
BuildArch: noarch
%description vim
10 years, 6 months
[golang/el6: 9/13] Merge branch 'master' into el6
by Vincent Batts
commit 8856b2e16660503d5e285b3d898ea8226c0a731a
Merge: f12359b ce418df
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 14:08:13 2013 -0500
Merge branch 'master' into el6
Conflicts:
golang.spec
golang-f21-hostname.patch | 13 ++++
golang.spec | 148 +++++++++++++++++++++++++++++++++-----------
2 files changed, 124 insertions(+), 37 deletions(-)
---
diff --cc golang.spec
index 29ba550,67958c8..cf4854a
--- a/golang.spec
+++ b/golang.spec
@@@ -71,11 -90,12 +90,15 @@@ Summary: The Go Programming Lang
#%{summary}.
-%package vim
-Summary: Vim plugins for Go
-Requires: vim-filesystem
-BuildArch: noarch
+%package vim
+Summary: Vim plugins for Go
+BuildArch: noarch
++# xemacs on fedora only
++%if 0%{?fedora} >= 0
++Requires: vim-filesystem
++%endif
- %description vim
+ %description vim
%{summary}.
@@@ -139,9 -174,14 +178,14 @@@ cd do
make
cd ..
-# compile for emacs and xemacs
+# compile for emacs
cd misc
mv emacs/go-mode-load.el emacs/%{name}-init.el
+ # xemacs on fedora only
+ %if 0%{?fedora} >= 0
+ cp -av emacs xemacs
+ %{_xemacs_bytecompile} xemacs/go-mode.el
+ %endif
%{_emacs_bytecompile} emacs/go-mode.el
cd ..
@@@ -241,8 -294,25 +298,25 @@@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_s
%{_emacs_sitestartdir}/*.el
+ # xemacs on fedora only
+ %if 0%{?fedora} >= 0
+ %files -n xemacs-%{name}
+ %doc AUTHORS CONTRIBUTORS LICENSE PATENTS
+ %{_xemacs_sitelispdir}/%{name}
+ %{_xemacs_sitestartdir}/*.el
+ %endif
+
+
%changelog
- * Fri Sep 20 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-4
-* Thu Nov 20 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-7
++* Thu Nov 21 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-7
+ - patch tests for testing on rawhide
+ - let the same spec work for rhel and fedora
+
+ * Wed Nov 20 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-6
+ - don't symlink /usr/bin out to ../lib..., move the file
+ - seperate out godoc, to accomodate the go.tools godoc
+
+ * Fri Sep 20 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 1.1.2-5
- Pull upstream patches for BZ#1010271
- Add glibc requirement that got dropped because of meta dep fix
10 years, 6 months
[golang/el6: 8/13] unify the spec to build on rhel and fedora
by Vincent Batts
commit ce418df0dfcbf85a6c99f75a7431af756b05463e
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 13:13:09 2013 -0500
unify the spec to build on rhel and fedora
golang.spec | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 190e814..67958c8 100644
--- a/golang.spec
+++ b/golang.spec
@@ -40,7 +40,11 @@ Patch1: golang-f21-hostname.patch
BuildRequires: /bin/hostname
%endif
-BuildRequires: emacs xemacs xemacs-packages-extra
+BuildRequires: emacs
+# xemacs on fedora only
+%if 0%{?fedora} >= 0
+BuildRequires: xemacs xemacs-packages-extra
+%endif
# We strip the meta dependency, but go does require glibc.
# This is an odd issue, still looking for a better fix.
@@ -104,6 +108,8 @@ BuildArch: noarch
%{summary}.
+# xemacs on fedora only
+%if 0%{?fedora} >= 0
%package -n xemacs-%{name}
Summary: XEmacs add-on package for Go
Requires: xemacs(bin) >= %{_xemacs_version}
@@ -112,6 +118,7 @@ BuildArch: noarch
%description -n xemacs-%{name}
%{summary}.
+%endif
# Workaround old RPM bug of symlink-replaced-with-dir failure
@@ -170,9 +177,12 @@ cd ..
# compile for emacs and xemacs
cd misc
mv emacs/go-mode-load.el emacs/%{name}-init.el
+# xemacs on fedora only
+%if 0%{?fedora} >= 0
cp -av emacs xemacs
-%{_emacs_bytecompile} emacs/go-mode.el
%{_xemacs_bytecompile} xemacs/go-mode.el
+%endif
+%{_emacs_bytecompile} emacs/go-mode.el
cd ..
@@ -222,11 +232,14 @@ mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
cp -av misc/emacs/go-mode.* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
cp -av misc/emacs/%{name}-init.el $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+# xemacs on fedora only
+%if 0%{?fedora} >= 0
# misc/xemacs
mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
cp -av misc/xemacs/go-mode.* $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name}
cp -av misc/xemacs/%{name}-init.el $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
+%endif
# misc/vim
mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles
@@ -281,15 +294,19 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
%{_emacs_sitestartdir}/*.el
+# xemacs on fedora only
+%if 0%{?fedora} >= 0
%files -n xemacs-%{name}
%doc AUTHORS CONTRIBUTORS LICENSE PATENTS
%{_xemacs_sitelispdir}/%{name}
%{_xemacs_sitestartdir}/*.el
+%endif
%changelog
* Thu Nov 20 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-7
- patch tests for testing on rawhide
+- let the same spec work for rhel and fedora
* Wed Nov 20 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-6
- don't symlink /usr/bin out to ../lib..., move the file
10 years, 6 months
[golang/el6: 7/13] version bump
by Vincent Batts
commit d09407f3440eca40853ef82a44dcc18e9356606c
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 12:28:27 2013 -0500
version bump
golang.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index accbac7..190e814 100644
--- a/golang.spec
+++ b/golang.spec
@@ -25,7 +25,7 @@
Name: golang
Version: 1.1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: The Go Programming Language
License: BSD
@@ -288,6 +288,9 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
%changelog
+* Thu Nov 20 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-7
+- patch tests for testing on rawhide
+
* Wed Nov 20 2013 Vincent Batts <vbatts(a)redhat.com> - 1.1.2-6
- don't symlink /usr/bin out to ../lib..., move the file
- seperate out godoc, to accomodate the go.tools godoc
10 years, 6 months
[golang/el6: 6/13] accomdate the move of hostname command for rawhide
by Vincent Batts
commit c91e9b6b852e32dc1eb3dd8de53e61ed17443f88
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 12:25:57 2013 -0500
accomdate the move of hostname command for rawhide
golang-f21-hostname.patch | 13 +++++++++++++
golang.spec | 11 +++++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/golang-f21-hostname.patch b/golang-f21-hostname.patch
new file mode 100644
index 0000000..acc3c6c
--- /dev/null
+++ b/golang-f21-hostname.patch
@@ -0,0 +1,13 @@
+Index: go/src/pkg/os/os_test.go
+===================================================================
+--- go.orig/src/pkg/os/os_test.go
++++ go/src/pkg/os/os_test.go
+@@ -842,7 +842,7 @@ func run(t *testing.T, cmd []string) str
+ if err != nil {
+ t.Fatal(err)
+ }
+- p, err := StartProcess("/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
++ p, err := StartProcess("/usr/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
+ if err != nil {
+ t.Fatal(err)
+ }
diff --git a/golang.spec b/golang.spec
index 2a87669..accbac7 100644
--- a/golang.spec
+++ b/golang.spec
@@ -32,7 +32,14 @@ License: BSD
URL: http://golang.org/
Source0: https://go.googlecode.com/files/go%{version}.src.tar.gz
+# this command moved places
+%if 0%{?fedora} >= 21
+BuildRequires: /usr/bin/hostname
+Patch1: golang-f21-hostname.patch
+%else
BuildRequires: /bin/hostname
+%endif
+
BuildRequires: emacs xemacs xemacs-packages-extra
# We strip the meta dependency, but go does require glibc.
@@ -124,6 +131,10 @@ end
# increase verbosity of build
%patch0 -p1
+%if 0%{?fedora} >= 21
+%patch1 -p1
+%endif
+
# Fix BZ#1010271
%patch10 -p1
%patch11 -p1
10 years, 6 months
[golang/el6: 5/13] formatting
by Vincent Batts
commit 7025cc82ad9bfa09ca82e30bc7fb89a944c17953
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Thu Nov 21 09:43:50 2013 -0500
formatting
golang.spec | 72 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index 924439f..2a87669 100644
--- a/golang.spec
+++ b/golang.spec
@@ -23,17 +23,17 @@
%global __spec_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot \
/usr/lib/rpm/brp-compress
-Name: golang
-Version: 1.1.2
-Release: 6%{?dist}
-Summary: The Go Programming Language
+Name: golang
+Version: 1.1.2
+Release: 6%{?dist}
+Summary: The Go Programming Language
-License: BSD
-URL: http://golang.org/
-Source0: https://go.googlecode.com/files/go%{version}.src.tar.gz
+License: BSD
+URL: http://golang.org/
+Source0: https://go.googlecode.com/files/go%{version}.src.tar.gz
-BuildRequires: /bin/hostname
-BuildRequires: emacs xemacs xemacs-packages-extra
+BuildRequires: /bin/hostname
+BuildRequires: emacs xemacs xemacs-packages-extra
# We strip the meta dependency, but go does require glibc.
# This is an odd issue, still looking for a better fix.
@@ -43,53 +43,53 @@ Requires: glibc
# while godoc is in go1.1, it is moved to go.tools in go1.2
Requires: /usr/bin/godoc
-Patch0: golang-1.1-verbose-build.patch
+Patch0: golang-1.1-verbose-build.patch
Patch10: golang-1.1.2-long-links.patch
Patch11: golang-1.1.2-ustar-split.patch
# Having documentation separate was broken
-Obsoletes: %{name}-docs < 1.1-4
+Obsoletes: %{name}-docs < 1.1-4
# RPM can't handle symlink -> dir with subpackages, so merge back
-Obsoletes: %{name}-data < 1.1.1-4
+Obsoletes: %{name}-data < 1.1.1-4
-ExclusiveArch: %{ix86} x86_64 %{arm}
+ExclusiveArch: %{ix86} x86_64 %{arm}
-Source100: golang-gdbinit
-Source101: golang-prelink.conf
+Source100: golang-gdbinit
+Source101: golang-prelink.conf
%description
%{summary}.
-%package godoc
-Summary: the Go Programming Language documentation tool
-%description godoc
+%package godoc
+Summary: The Go Programming Language documentation tool
+%description godoc
%{summary}.
# Restore this package if RPM gets fixed (bug #975909)
-#%package data
-#Summary: Required architecture-independent files for Go
-#Requires: %{name} = %{version}-%{release}
-#BuildArch: noarch
-#Obsoletes: %{name}-docs < 1.1-4
+#%package data
+#Summary: Required architecture-independent files for Go
+#Requires: %{name} = %{version}-%{release}
+#BuildArch: noarch
+#Obsoletes: %{name}-docs < 1.1-4
#
-#%description data
+#%description data
#%{summary}.
-%package vim
-Summary: Vim plugins for Go
-Requires: vim-filesystem
-BuildArch: noarch
+%package vim
+Summary: Vim plugins for Go
+Requires: vim-filesystem
+BuildArch: noarch
-%description vim
+%description vim
%{summary}.
-%package -n emacs-%{name}
-Summary: Emacs add-on package for Go
+%package -n emacs-%{name}
+Summary: Emacs add-on package for Go
Requires: emacs(bin) >= %{_emacs_version}
BuildArch: noarch
@@ -97,11 +97,11 @@ BuildArch: noarch
%{summary}.
-%package -n xemacs-%{name}
-Summary: XEmacs add-on package for Go
-Requires: xemacs(bin) >= %{_xemacs_version}
-Requires: xemacs-packages-extra
-BuildArch: noarch
+%package -n xemacs-%{name}
+Summary: XEmacs add-on package for Go
+Requires: xemacs(bin) >= %{_xemacs_version}
+Requires: xemacs-packages-extra
+BuildArch: noarch
%description -n xemacs-%{name}
%{summary}.
10 years, 6 months
[golang/el6] (13 commits) ...Merge branch 'master' into el6
by Vincent Batts
Summary of changes:
5998fbd... EL6 edits (*)
b77f6c7... Revert "EL6 edits" (*)
355d9b0... fix for BZ#1010271 (*)
d8b5074... seperate the godoc into its own package again, but let it b (*)
7025cc8... formatting
c91e9b6... accomdate the move of hostname command for rawhide
d09407f... version bump
ce418df... unify the spec to build on rhel and fedora
8856b2e... Merge branch 'master' into el6
6c39c37... vim-filesystem conditional for fedora
866e8dc... Merge branch 'master' into el6
8efa624... fixed the date
adb88d9... Merge branch 'master' into el6
(*) This commit already existed in another branch; no separate mail sent
10 years, 6 months