The package rpms/golang-github-sasha-s-go-deadlock.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-sasha-s-go-deadlock....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 14633c8d3174b97b7e7e9833ed8738194227dfc6
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Sun Sep 2 20:15:11 2018 +0200
bump to commit d68e2bc and update to spec 3.0
diff --git a/.gitignore b/.gitignore
index 0f6140a..04ac2e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/go-deadlock-3410008.tar.gz
/go-deadlock-565eb44.tar.gz
/sasha-s-go-deadlock-03d40e5.tar.gz
+/go-deadlock-d68e2bc52ae3291765881b9056f2c1527f245f1e.tar.gz
diff --git a/00-fix-locking-order.patch b/00-fix-locking-order.patch
deleted file mode 100644
index 6f09f02..0000000
--- a/00-fix-locking-order.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/deadlock.go b/deadlock.go
-index 6f8f81e..68c7b7a 100644
---- a/deadlock.go
-+++ b/deadlock.go
-@@ -189,8 +189,8 @@ func lock(lockFn func(), ptr interface{}) {
- if buf, ok := Opts.LogBuf.(*bufio.Writer); ok {
- buf.Flush()
- }
-- lo.mu.Unlock()
- Opts.mu.Unlock()
-+ lo.mu.Unlock()
- Opts.OnPotentialDeadlock()
- <-ch
- PostLock(4, ptr)
diff --git a/01-fix-another-locking-order.patch b/01-fix-another-locking-order.patch
deleted file mode 100644
index f1f2e3a..0000000
--- a/01-fix-another-locking-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6970cb987309cbf378c4797818df3dc55da31726 Mon Sep 17 00:00:00 2001
-From: Nao YONASHIRO <owan.orisano(a)gmail.com>
-Date: Thu, 7 Jun 2018 16:41:41 +0900
-Subject: [PATCH] fix: fix RUnlock timing (#10)
-
-* fix: fix RUnlock timing
----
- deadlock.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deadlock.go b/deadlock.go
-index 68c7b7a..39eefeb 100644
---- a/deadlock.go
-+++ b/deadlock.go
-@@ -115,10 +115,10 @@ func (m *RWMutex) RLock() {
- // It is a run-time error if rw is not locked for reading
- // on entry to RUnlock.
- func (m *RWMutex) RUnlock() {
-+ m.mu.RUnlock()
- if !Opts.Disable {
- PostUnlock(m)
- }
-- m.mu.RUnlock()
- }
-
- // RLocker returns a Locker interface that implements
diff --git a/golang-github-sasha-s-go-deadlock.spec
b/golang-github-sasha-s-go-deadlock.spec
index 52527a1..a678bb8 100644
--- a/golang-github-sasha-s-go-deadlock.spec
+++ b/golang-github-sasha-s-go-deadlock.spec
@@ -1,179 +1,59 @@
-# 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 sasha-s
-%global repo go-deadlock
#
https://github.com/sasha-s/go-deadlock
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 03d40e5dbd5488667a13b3c2600b2f7c2886f02f
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20171130
+%global goipath
github.com/sasha-s/go-deadlock
+%global commit d68e2bc52ae3291765881b9056f2c1527f245f1e
+%global date 20180822
-# commit 03d40e5dbd5488667a13b3c2600b2f7c2886f02f == version 0.2.0
+%gometa
-
-Name: golang-%{provider}-%{project}-%{repo}
+Name: golang-github-sasha-s-go-deadlock
Version: 0.2.0
-Release: 5%{?dist}
+Release: 7%{?dist}
Summary: Online deadlock detection in go
License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{project}-%{repo}-%{shortcommit}.tar.gz
-
-# Upstream patch to fix a locking order, from commit:
-#
https://github.com/sasha-s/go-deadlock/commit/89fc81536521522e45c1465e2b4...
-Patch0: 00-fix-locking-order.patch
-
-# Another upstream patch to fix locking order, from commit:
-#
https://github.com/sasha-s/go-deadlock/commit/6970cb987309cbf378c4797818d...
-Patch1: 01-fix-another-locking-order.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
-%if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires:
golang(github.com/petermattis/goid)
-%endif
-
-Requires:
golang(github.com/petermattis/goid)
-
-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
-%patch1 -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}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
-
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
+%gochecks
-%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> -
0.2.0-7.20180822gitd68e2bc
+- Bump to commit d68e2bc.
+- Update to use spec 3.0.
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 9af6fe7..b61d9fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sasha-s-go-deadlock-03d40e5.tar.gz) =
3284aba71a7524af624ab1cb63e8926809e19e778af07994ec2f210d33c7cb63819c93e117dc17240f0618e6710c7a4d65b3eeba34690f4d56080ffd99a70bfb
+SHA512 (go-deadlock-d68e2bc52ae3291765881b9056f2c1527f245f1e.tar.gz) =
3b0e7d2c0cf8b87fe3326951e417414059b26d4725c423f300fd58396565ae5cd38a9258330ea829e9422a1459601ee7e535b7446f1848d9006160fcabb27592