From e287321d81f9f694954243080f8efe14026c11ab Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Mar 14 2018 01:17:33 +0000 Subject: Update with the new Go packaging --- diff --git a/.gitignore b/.gitignore index d8b2a6b..8f6bedb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /json5-7620272.tar.gz +/json5-7620272ed63390e979cf5882d2fa0506fe2a8db5.tar.gz diff --git a/golang-github-flynn-json5.spec b/golang-github-flynn-json5.spec index 5bd5e39..941caeb 100644 --- a/golang-github-flynn-json5.spec +++ b/golang-github-flynn-json5.spec @@ -1,190 +1,65 @@ -# If any of the following macros should be set otherwise, -# you can wrap any of them with the following conditions: -# - %%if 0%%{centos} == 7 -# - %%if 0%%{?rhel} == 7 -# - %%if 0%%{?fedora} == 23 -# Or just test for particular distribution: -# - %%if 0%%{centos} -# - %%if 0%%{?rhel} -# - %%if 0%%{?fedora} -# -# Be aware, on centos, both %%rhel and %%centos are set. If you want to test -# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. -# (Don't forget to replace double percentage symbol with single one in order to apply a condition) - -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 # Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - +%bcond_without check -%global provider github -%global provider_tld com -%global project flynn -%global repo json5 -# https://github.com/flynn/json5 -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +%global goipath github.com/flynn/json5 %global commit 7620272ed63390e979cf5882d2fa0506fe2a8db5 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20160717 - -Name: golang-%{provider}-%{project}-%{repo} -Version: 0 -Release: 0.2.%{commitdate}git%{shortcommit}%{?dist} -Summary: Go JSON5 decoder package based on encoding/json -# Main package: BSD -# Test data: MIT -License: BSD and MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# 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} - +%global common_description %{expand: +Go JSON5 decoder package based on encoding/json.} -%description -%{summary} - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch - -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif - +%gometa -Provides: golang(%{import_path}) = %{version}-%{release} +Name: %{goname} +Version: 0 +Release: 0.3%{?dist} +Summary: Go JSON5 decoder package based on encoding/json +License: BSD and MIT +URL: %{gourl} +Source: %{gosource} -%description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} +%if %{with check} BuildRequires: golang(github.com/kylelemons/godebug/pretty) BuildRequires: golang(github.com/robertkrimen/otto) %endif -Requires: golang(github.com/kylelemons/godebug/pretty) -Requires: golang(github.com/robertkrimen/otto) +%description +%{common_description} -%description unit-test-devel -%{summary} -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel +%{common_description} + +This package contains the source code needed for building packages that import +the %{goipath} Go namespace. + %prep -%autosetup -n %{repo}-%{commit} +%gosetup -q -%build -%install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif +%install +%goinstall -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%if %{with check} %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# No dependency directories so far - -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} +%gochecks %endif -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE %doc README.md CONTRIBUTING.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md CONTRIBUTING.md -%endif %changelog +* Thu Mar 08 2018 Robert-André Mauchin - 0-0.3.20180314git7620272 +- Update with the new Go packaging + * Wed Feb 07 2018 Fedora Release Engineering - 0-0.2.20160717git7620272 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 9940e7b..7f8e2fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (json5-7620272.tar.gz) = c958cf3e14d40fe18c683306fa4c309a50eb635444d4251a32472d72a590ee9cf554b8871310b2aa49e83c6f349977fa54e2212eac3e8ade076864cb1bbf3915 +SHA512 (json5-7620272ed63390e979cf5882d2fa0506fe2a8db5.tar.gz) = c958cf3e14d40fe18c683306fa4c309a50eb635444d4251a32472d72a590ee9cf554b8871310b2aa49e83c6f349977fa54e2212eac3e8ade076864cb1bbf3915