The package rpms/golang-github-thejerf-suture.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-thejerf-suture.git/....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit e6fa0505b614a10730bb9a375ab696fa4e8d3246
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sun Sep 2 20:46:59 2018 +0200
bump to commit 743e30e and update to spec 3.0
diff --git a/.gitignore b/.gitignore
index 8861278..80cec48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/suture-0ac47af.tar.gz
/thejerf-suture-bb8f537.tar.gz
/thejerf-suture-f44dbcd.tar.gz
+/suture-743e30ef0ead4e2488c262cb584689c9d8c8ea5a.tar.gz
diff --git a/00-prevent-hanging-indefinitely.patch
b/00-prevent-hanging-indefinitely.patch
deleted file mode 100644
index 41b829d..0000000
--- a/00-prevent-hanging-indefinitely.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From daf204b831cd75ed3c45db07368087e7ad9eed2a Mon Sep 17 00:00:00 2001
-From: Audrius Butkevicius <audrius.butkevicius(a)gmail.com>
-Date: Sun, 24 Jun 2018 21:42:54 +0100
-Subject: [PATCH] Prevent RemoveAndWait from hanging indefinitely
-
----
- supervisor.go | 4 ++--
- suture_test.go | 20 ++++++++++++++++++++
- 2 files changed, 22 insertions(+), 2 deletions(-)
- mode change 100644 => 100755 supervisor.go
- mode change 100644 => 100755 suture_test.go
-
-diff --git a/supervisor.go b/supervisor.go
-old mode 100644
-new mode 100755
-index 10a01bb..07aef04
---- a/supervisor.go
-+++ b/supervisor.go
-@@ -546,10 +546,10 @@ func (s *Supervisor) removeService(id serviceID, notificationChan
chan struct{},
- delete(s.services, id)
- s.servicesShuttingDown[id] = namedService
- go func() {
-- successChan := make(chan bool)
-+ successChan := make(chan struct{})
- go func() {
- namedService.Service.Stop()
-- successChan <- true
-+ close(successChan)
- if notificationChan != nil {
- notificationChan <- struct{}{}
- }
-diff --git a/suture_test.go b/suture_test.go
-old mode 100644
-new mode 100755
-index 4f553b2..7782241
---- a/suture_test.go
-+++ b/suture_test.go
-@@ -589,6 +589,26 @@ func TestRemoveAndWait(t *testing.T) {
- if err != ErrTimeout {
- t.Fatal("Unexpected result for RemoveAndWait on a stopped service: " +
err.Error())
- }
-+
-+ // Abnormal case: The service takes long to terminate, which takes more than the
timeout of the spec, but
-+ // if the service eventually terminates, this does not hang RemoveAndWait.
-+ s = NewSimple("main")
-+ s.timeout = time.Millisecond
-+ s.ServeBackground()
-+ service = NewService("A1")
-+ token = s.Add(service)
-+ <-service.started
-+ service.take <- Hang
-+
-+ go func() {
-+ time.Sleep(10 * time.Millisecond)
-+ service.release <- true
-+ }()
-+
-+ err = s.RemoveAndWait(token, 0)
-+ if err != nil {
-+ t.Fatal("Unexpected result of RemoveAndWait: " + err.Error())
-+ }
- }
-
- func TestCoverage(t *testing.T) {
diff --git a/golang-github-thejerf-suture.spec b/golang-github-thejerf-suture.spec
index 084108c..83de6ec 100644
--- a/golang-github-thejerf-suture.spec
+++ b/golang-github-thejerf-suture.spec
@@ -1,175 +1,57 @@
-# 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
-
-%global provider github
-%global provider_tld com
-%global project thejerf
-%global repo suture
#
https://github.com/thejerf/suture
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit f44dbcdd98cf42f65b78faac17288ad1ba2c041b
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20180103
+%global goipath
github.com/thejerf/suture
+%global commit 743e30ef0ead4e2488c262cb584689c9d8c8ea5a
+%global date 20180802
-# commit f44dbcdd98cf42f65b78faac17288ad1ba2c041b == version 2.0.3
+%gometa
-
-Name: golang-%{provider}-%{project}-%{repo}
+Name: %{goname}
Version: 2.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Supervisor trees for Go
License: MIT
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{project}-%{repo}-%{shortcommit}.tar.gz
-
-# Upstream patch to prevent programs from hanging indefinitely, from commit:
-#
https://github.com/thejerf/suture/commit/daf204b831cd75ed3c45db07368087e7...
-Patch0: 00-prevent-hanging-indefinitely.patch
-# 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}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%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
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-%patch0 -p1
-
-
-%build
+%gosetup -q
%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
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%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
+%gochecks
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-%if ! 0%{?gotest:1}
-%global gotest go test
-%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
+* Sun Sep 02 2018 Fabio Valentini <decathorpe(a)gmail.com> -
2.0.3-3.20180802git743e30e
+- Bump to commit 743e30e.
+- Update to use spec 3.0.
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.3-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 94584b2..5cc212a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (thejerf-suture-f44dbcd.tar.gz) =
224896f4204f46d9094e933ee14ada3a68be839ff7087880e03d4f70f9a5db8eef32e8675064cd578fa078acb76941fda1466e41f84dd3a421e49b6a335b20f1
+SHA512 (suture-743e30ef0ead4e2488c262cb584689c9d8c8ea5a.tar.gz) =
6c09239e985bbb1b94f64732741744f8d87b70edabe53643e6dfe95c55cb404c16ac73ea9c98375dca96da3a478749a50c7abd8ab47785991f2f95262f154f9f