From 5e070b5c1c6d81005ca9c5d982e095e5649d1974 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jan 13 2017 11:54:08 +0000 Subject: Bump to upstream ef8133da8cda503718a74741312bf50821e6de79 - related: #1250468 --- diff --git a/.gitignore b/.gitignore index a65b5e0..d8205ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/hcl-2deb1d1.tar.gz +/hcl-ef8133d.tar.gz diff --git a/golang-github-hashicorp-hcl.spec b/golang-github-hashicorp-hcl.spec index 41b2eeb..5077e1a 100644 --- a/golang-github-hashicorp-hcl.spec +++ b/golang-github-hashicorp-hcl.spec @@ -36,12 +36,12 @@ # https://github.com/hashicorp/hcl %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 2deb1d1db27ed473f38fe65a16044572b9ff9d30 +%global commit ef8133da8cda503718a74741312bf50821e6de79 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: golang-%{provider}-%{project}-%{repo} Version: 0 -Release: 0.9.git%{shortcommit}%{?dist} +Release: 0.10.git%{shortcommit}%{?dist} Summary: HCL is a configuration language License: MPLv2.0 URL: https://%{provider_prefix} @@ -61,14 +61,20 @@ Summary: %{summary} BuildArch: noarch %if 0%{?with_check} -BuildRequires: golang(github.com/hashicorp/go-multierror) %endif -Requires: golang(github.com/hashicorp/go-multierror) - Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/hcl) = %{version}-%{release} -Provides: golang(%{import_path}/json) = %{version}-%{release} +Provides: golang(%{import_path}/hcl/ast) = %{version}-%{release} +Provides: golang(%{import_path}/hcl/fmtcmd) = %{version}-%{release} +Provides: golang(%{import_path}/hcl/parser) = %{version}-%{release} +Provides: golang(%{import_path}/hcl/printer) = %{version}-%{release} +Provides: golang(%{import_path}/hcl/scanner) = %{version}-%{release} +Provides: golang(%{import_path}/hcl/strconv) = %{version}-%{release} +Provides: golang(%{import_path}/hcl/token) = %{version}-%{release} +Provides: golang(%{import_path}/json/parser) = %{version}-%{release} +Provides: golang(%{import_path}/json/scanner) = %{version}-%{release} +Provides: golang(%{import_path}/json/token) = %{version}-%{release} +Provides: golang(%{import_path}/testhelper) = %{version}-%{release} %description devel %{summary} @@ -81,16 +87,16 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test Summary: Unit tests for %{name} package -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running +BuildRequires: golang(github.com/davecgh/go-spew/spew) %endif # test subpackage tests code from devel subpackage Requires: %{name}-devel = %{version}-%{release} +Requires: golang(github.com/davecgh/go-spew/spew) %description unit-test %{summary} @@ -189,6 +195,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Fri Jan 13 2017 Jan Chaloupka - 0-0.10.gitef8133d +- Bump to upstream ef8133da8cda503718a74741312bf50821e6de79 + related: #1250468 + * Thu Jan 12 2017 Jan Chaloupka - 0-0.9.git2deb1d1 - Polish the spec file related: #1250468 diff --git a/sources b/sources index 0d74452..aa06d6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -229ce447fcb90f6dd25bc585de51d0de hcl-2deb1d1.tar.gz +SHA512 (hcl-ef8133d.tar.gz) = cad2a6275c7326a032b5dccf24b4c8a5b450fb298007f2be13ac24948961f61f33f082b0c040bbaf1de1b73f5dfbc1e2400036867bfd7936ea8f7fc43c6b4e63