up to 0.7.11; use go 1.6

diff --git a/gitlab-workhorse.spec b/gitlab-workhorse.spec
index 803c01aca88411fa9ab5212db18a6ad7b4eb7b85..d99ed22a8741de110086403a425e69c173e964af 100644 (file)
--- a/gitlab-workhorse.spec
+++ b/gitlab-workhorse.spec
@@ -1,16 +1,15 @@
 Summary:       An HTTP daemon that serves Git clients
 Name:          gitlab-workhorse
-Version:       0.7.1
+Version:       0.7.11
 Release:       0.7
 License:       MIT
 Group:         Development/Building
 # md5 deliberately omitted until this package is useful
 Source0:       https://gitlab.com/gitlab-org/gitlab-workhorse/repository/archive.tar.gz?ref=v%{version}&/%{name}-%{version}.tar.gz
 Source1:       %{name}.service
-Patch0:                go.patch
 URL:           https://gitlab.com/gitlab-org/gitlab-workhorse
 BuildRequires: git-core
-BuildRequires: golang
+BuildRequires: golang >= 1.6
 %{?with_systemd:BuildRequires: systemd-units}
 Obsoletes:     gitlab-git-http-server <= 0.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -24,7 +23,6 @@ Rails app.
 %prep
 %setup -qc
 mv %{name}-v%{version}-*/* .
-%patch0 -p1
 
 %build
 # make version similar when built from git:

diff --git a/go.patch b/go.patch
deleted file mode 100644 (file)
index 2b138d0..0000000
--- a/go.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gitlab-workhorse-0.7.1/Makefile~   2016-03-21 14:04:24.000000000 +0200
-+++ gitlab-workhorse-0.7.1/Makefile    2016-04-17 22:52:07.310556758 +0300
-@@ -1,6 +1,6 @@
- PREFIX=/usr/local
- VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
--GOBUILD=go build -ldflags "-X main.Version=${VERSION}"
-+GOBUILD=go build -ldflags "-X main.Version ${VERSION}"
- 
- all: gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse
-