The package rpms/golang-github-zyedidia-terminal.git has added or updated architecture
specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-zyedidia-terminal.g....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit fe7a2ef5455adea18e2cc9908f3cf082a306dafe
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Mar 20 17:31:20 2018 +0100
Replace original "j4k.co/terminal" with the fork
diff --git a/golang-github-zyedidia-terminal.spec b/golang-github-zyedidia-terminal.spec
index 828d4b8..466e78c 100644
--- a/golang-github-zyedidia-terminal.spec
+++ b/golang-github-zyedidia-terminal.spec
@@ -11,7 +11,7 @@ Vt10x terminal emulation backend.}
Name: %{goname}
Version: 0
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
Summary: Vt10x terminal emulation backend
License: MIT
URL: %{gourl}
@@ -39,7 +39,8 @@ the %{goipath} Go namespace.
%prep
%gosetup -q
-sed -i
's|"github.com/james4k/termbox-go-noinput"|"github.com/nsf/termbox-go"|'
boxterm/main.go
+sed -i
's|"github.com/james4k/termbox-go-noinput"|"github.com/nsf/termbox-go"|;
+
s|"j4k.co/terminal"|"github.com/zyedidia/terminal"|'
boxterm/main.go
%install
@@ -58,6 +59,9 @@ sed -i
's|"github.com/james4k/termbox-go-noinput"|"github.com/nsf/termbox-go"|'
%changelog
+* Tue Mar 20 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.4.20180314git1760577
+- Replace original "j4k.co/terminal" with the fork
+
* Tue Mar 20 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.3.20180314git1760577
- Replace forked dependency with original one
commit 589586f45954e520c990f86f8968933ae1ae17cb
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Mar 20 16:54:58 2018 +0100
Replace forked dependency with original one
diff --git a/golang-github-zyedidia-terminal.spec b/golang-github-zyedidia-terminal.spec
index cd952a0..828d4b8 100644
--- a/golang-github-zyedidia-terminal.spec
+++ b/golang-github-zyedidia-terminal.spec
@@ -11,7 +11,7 @@ Vt10x terminal emulation backend.}
Name: %{goname}
Version: 0
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
Summary: Vt10x terminal emulation backend
License: MIT
URL: %{gourl}
@@ -39,6 +39,8 @@ the %{goipath} Go namespace.
%prep
%gosetup -q
+sed -i
's|"github.com/james4k/termbox-go-noinput"|"github.com/nsf/termbox-go"|'
boxterm/main.go
+
%install
%goinstall
@@ -56,6 +58,9 @@ the %{goipath} Go namespace.
%changelog
+* Tue Mar 20 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.3.20180314git1760577
+- Replace forked dependency with original one
+
* Fri Mar 09 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.2.20180314git1760577
- Update with the new Go packaging
commit 834034c80fd4120643a1d85181f1580a55b8b908
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 21:32:37 2018 +0100
Update with the new Go packaging
diff --git a/.gitignore b/.gitignore
index 6026b82..da2b067 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/terminal-1760577.tar.gz
+/terminal-1760577dbc0058809dd115a6bfe5999b6b24ab53.tar.gz
diff --git a/golang-github-zyedidia-terminal.spec b/golang-github-zyedidia-terminal.spec
index fbbb4dc..cd952a0 100644
--- a/golang-github-zyedidia-terminal.spec
+++ b/golang-github-zyedidia-terminal.spec
@@ -1,188 +1,64 @@
-# 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 zyedidia
-%global repo terminal
-#
https://github.com/zyedidia/terminal
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global goipath
github.com/zyedidia/terminal
%global commit 1760577dbc0058809dd115a6bfe5999b6b24ab53
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20180126
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.1.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Vt10x terminal emulation backend
-License: 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:
+Vt10x terminal emulation backend.}
+%gometa
+Name: %{goname}
+Version: 0
+Release: 0.2%{?dist}
+Summary: Vt10x terminal emulation backend
+License: MIT
+URL: %{gourl}
+Source: %{gosource}
-%description
-Package terminal is a vt10x terminal emulation backend, influenced largely
-by st, rxvt, xterm, and iTerm as reference. Use it for terminal muxing,
-a terminal emulation frontend, or wherever else you need terminal emulation.
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
+%if %{with check}
BuildRequires:
golang(github.com/zyedidia/pty)
%endif
-Requires:
golang(github.com/zyedidia/pty)
+%description
+%{common_description}
-Provides: golang(%{import_path}) = %{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
-%setup -q -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
+%gochecks
%endif
-%gotest %{import_path}
-%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
-%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
-%endif
%changelog
-* Fri Jan 26 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.1.20180126git1760577
+* Fri Mar 09 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.2.20180314git1760577
+- Update with the new Go packaging
+
+* Fri Jan 26 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.1.20180125git1760577
- Initial package for Fedora
diff --git a/sources b/sources
index 79e7853..b47cbd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (terminal-1760577.tar.gz) =
89a5a429fd344daa8393fe79eb9b04708b2ff5488125b98f812732ade97f328ff522f69a12576985402154bbc013746e3b3d550bdf3741a00acd9183e6439ab6
+SHA512 (terminal-1760577dbc0058809dd115a6bfe5999b6b24ab53.tar.gz) =
89a5a429fd344daa8393fe79eb9b04708b2ff5488125b98f812732ade97f328ff522f69a12576985402154bbc013746e3b3d550bdf3741a00acd9183e6439ab6