[packages/gitlab-workhorse] up to 0.7.11; use go 1.6
glen
glen at pld-linux.org
Thu Aug 25 12:50:20 CEST 2016
commit 2d17e0698ec38b3aef046dda3b8e04cf0910488f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Aug 25 13:50:13 2016 +0300
up to 0.7.11; use go 1.6
gitlab-workhorse.spec | 6 ++----
go.patch | 10 ----------
2 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/gitlab-workhorse.spec b/gitlab-workhorse.spec
index 803c01a..d99ed22 100644
--- 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
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
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-workhorse.git/commitdiff/2d17e0698ec38b3aef046dda3b8e04cf0910488f
More information about the pld-cvs-commit
mailing list