Browse Source

upgrading package: helm 3.0.0b4.20191020 -> 3.0.0.20191124

master
parent
commit
1a58abc04f
  1. 37
      helm/helm.patch
  2. 12
      helm/helm.spec

37
helm/helm.patch

@ -1,27 +1,18 @@
Index: src/k8s.io/helm/Makefile
--- src/k8s.io/helm/Makefile.orig 2019-03-24 09:51:45.000000000 +0100
+++ src/k8s.io/helm/Makefile 2019-03-24 10:05:21.313313000 +0100
@@ -9,12 +9,12 @@
--- src/k8s.io/helm/Makefile.orig 2019-11-24 10:10:17.837633000 +0100
+++ src/k8s.io/helm/Makefile 2019-11-24 10:11:10.057142000 +0100
@@ -17,17 +17,17 @@
TAGS :=
TESTS := .
TESTFLAGS :=
-LDFLAGS := -w -s
-GOFLAGS :=
+LDFLAGS :=
+GOFLAGS := -v
SRC := $(shell find . -type f -name '*.go' -print)
# go option
GO ?= go
-PKG := $(shell glide novendor)
+PKG :=
TAGS :=
TESTS := .
TESTFLAGS :=
-LDFLAGS := -w -s
-GOFLAGS :=
+LDFLAGS :=
+GOFLAGS := -v
BINDIR := $(CURDIR)/bin
BINARIES := helm tiller
Index: src/k8s.io/helm/versioning.mk
--- src/k8s.io/helm/versioning.mk.orig 2019-03-24 09:51:45.000000000 +0100
+++ src/k8s.io/helm/versioning.mk 2019-03-24 10:06:16.396532000 +0100
@@ -1,9 +1,9 @@
MUTABLE_VERSION := canary
# Required for globs to work correctly
SHELL = /bin/bash
-GIT_COMMIT = $(shell git rev-parse HEAD)
-GIT_SHA = $(shell git rev-parse --short HEAD)
@ -33,4 +24,4 @@ Index: src/k8s.io/helm/versioning.mk
+GIT_DIRTY = clean
ifdef VERSION
DOCKER_VERSION = $(VERSION)
BINARY_VERSION = $(VERSION)

12
helm/helm.spec

@ -22,8 +22,8 @@
##
# package version
%define V_helm_base 3.0.0b4
%define V_helm_snap 20191020
%define V_helm_base 3.0.0
%define V_helm_snap 20191124
# package information
Name: helm
@ -36,7 +36,7 @@ Class: EVAL
Group: Web
License: Apache
Version: %{V_helm_base}.%{V_helm_snap}
Release: 20191020
Release: 20191124
# list of sources
Source0: http://download.openpkg.org/components/versioned/helm/helm-%{V_helm_snap}.tar.xz
@ -70,7 +70,7 @@ PreReq: OpenPKG, openpkg >= 20160101
# build program
export GOPATH=`pwd`
cd src/k8s.io/helm
%{l_make} %{l_mflags} build
%{l_make} %{l_mflags} build SHELL=bash
%install
# create directory hierarchy
@ -82,10 +82,6 @@ PreReq: OpenPKG, openpkg >= 20160101
%{l_shtool} install -c -s -m 755 \
src/k8s.io/helm/bin/helm \
$RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -s -m 755 \
src/k8s.io/helm/bin/rudder \
src/k8s.io/helm/bin/tiller \
$RPM_BUILD_ROOT%{l_prefix}/sbin/
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}

Loading…
Cancel
Save