From 295fc78bb18422177d685893487aee5259c176e0 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Mar 14 2018 16:35:04 +0000 Subject: Update with the new Go packaging Upstream GIT revision 6c383dd --- diff --git a/.gitignore b/.gitignore index 54afeb0..abcc61b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /otto-3b44b4d.tar.gz +/otto-6c383dd335ef8dcccef05e651ce1eccfe4d0f011.tar.gz diff --git a/golang-github-robertkrimen-otto.spec b/golang-github-robertkrimen-otto.spec index 4a5b883..2dae412 100644 --- a/golang-github-robertkrimen-otto.spec +++ b/golang-github-robertkrimen-otto.spec @@ -1,197 +1,71 @@ -# 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 -# Tests fail on arches != x86_64 -%global with_check 0 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 +# Run tests in check section +# Tests fail on non x86_64 +%ifnarch x86_64 +%bcond_with check %else -%global debug_package %{nil} +%bcond_without check %endif +%global goipath github.com/robertkrimen/otto +%global commit 6c383dd335ef8dcccef05e651ce1eccfe4d0f011 -%global provider github -%global provider_tld com -%global project robertkrimen -%global repo otto -# https://github.com/robertkrimen/otto -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 3b44b4dcb6c00477273595c312908e2412d07da6 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20171130 +%global common_description %{expand: +A JavaScript interpreter in Golang.} -Name: golang-%{provider}-%{project}-%{repo} -Version: 0 -Release: 0.2.%{commitdate}git%{shortcommit}%{?dist} -Summary: A JavaScript interpreter in Golang -License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +%gometa -# 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} +Name: %{goname} +Version: 0 +Release: 0.1%{?dist} +Summary: A JavaScript interpreter in Golang +License: MIT +URL: %{gourl} +Source: %{gosource} - - -%description -%{summary} - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch - -%if 0%{?with_check} && ! 0%{?with_bundled} +%if %{with check} BuildRequires: golang(gopkg.in/readline.v1) BuildRequires: golang(gopkg.in/sourcemap.v1) %endif -Requires: golang(gopkg.in/readline.v1) -Requires: golang(gopkg.in/sourcemap.v1) +%description +%{common_description} -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/ast) = %{version}-%{release} -Provides: golang(%{import_path}/dbg) = %{version}-%{release} -Provides: golang(%{import_path}/file) = %{version}-%{release} -Provides: golang(%{import_path}/parser) = %{version}-%{release} -Provides: golang(%{import_path}/registry) = %{version}-%{release} -Provides: golang(%{import_path}/repl) = %{version}-%{release} -Provides: golang(%{import_path}/terst) = %{version}-%{release} -Provides: golang(%{import_path}/token) = %{version}-%{release} -Provides: golang(%{import_path}/underscore) = %{version}-%{release} +%package devel +Summary: %{summary} +BuildArch: noarch + %description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif +%{common_description} + +This package contains the source code needed for building packages that import +the %{goipath} Go namespace. -%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} -%endif - - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif %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} -%gotest %{import_path}/ast -%gotest %{import_path}/parser +%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 -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif +%doc README.markdown -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%endif %changelog +* Fri Mar 09 2018 Robert-André Mauchin - 0-0.1.20180314git6c383dd +- Update with the new Go packaging +- Upstream GIT revision 6c383dd + * Wed Feb 07 2018 Fedora Release Engineering - 0-0.2.20171130git3b44b4d - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 6decfe3..65e99c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otto-3b44b4d.tar.gz) = ae6391646725c27ca28ea3944b119f55f6d8182ec7adb7d534eb47eaecdd7981ead83414c70d600da3cd487e342868887d3412a0f7e3a6be26268d64e194ce88 +SHA512 (otto-6c383dd335ef8dcccef05e651ce1eccfe4d0f011.tar.gz) = 94283e7f8ff014ac1ee7390ce84d7f358a9d4a1f945fa1dfccd8630728e18b8275f23de0fdf88929dad6ac97494b65204e781c79055af3fcd69d34459cfe7414