From 4bcce03307a634a3354296c5de3860c06800be6f Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jan 24 2017 07:16:24 +0000 Subject: Bump to upstream f12c6236fe7b5cf6bcf30e5935d08cb079d78334 - related: #1318299 --- diff --git a/.gitignore b/.gitignore index d5884f5..a4532f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/fsnotify-96c060f.tar.gz +/fsnotify-f12c623.tar.gz diff --git a/golang-github-go-fsnotify-fsnotify.spec b/golang-github-go-fsnotify-fsnotify.spec index aaa8881..01c4f7b 100644 --- a/golang-github-go-fsnotify-fsnotify.spec +++ b/golang-github-go-fsnotify-fsnotify.spec @@ -1,16 +1,28 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 +# 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 -%global with_check 1 -%global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 0 -%global with_debug 0 +# Run tests in check section +# Failing tests on various archs %global with_check 0 -%global with_unit_test 0 -%endif +# Generate unit-test rpm +%global with_unit_test 1 %if 0%{?with_debug} %global _dwz_low_mem_die_limit 0 @@ -25,22 +37,23 @@ # https://github.com/go-fsnotify/fsnotify %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0 +%global sec_import_path github.com/fsnotify/fsnotify +%global commit f12c6236fe7b5cf6bcf30e5935d08cb079d78334 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gopkg_import_path gopkg.in/fsnotify.v1 %global sec_gopkg_import_path gopkg.in/v1/fsnotify Name: golang-%{provider}-%{project}-%{repo} -Version: 1.2.0 -Release: 0.5.git%{shortcommit}%{?dist} +Version: 1.3.1 +Release: 0.1.git%{shortcommit}%{?dist} Summary: File system notifications for Go License: BSD 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 %{arm}} +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} @@ -53,9 +66,13 @@ Summary: %{summary} BuildArch: noarch %if 0%{?with_check} +BuildRequires: golang(golang.org/x/sys/unix) %endif +Requires: golang(golang.org/x/sys/unix) + Provides: golang(%{import_path}) = %{version}-%{release} +Provides: golang(%{sec_import_path}) = %{version}-%{release} Provides: golang(%{gopkg_import_path}) = %{version}-%{release} Provides: golang(%{sec_gopkg_import_path}) = %{version}-%{release} @@ -72,8 +89,6 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test Summary: Unit tests for %{name} package -# 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} %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests @@ -101,6 +116,8 @@ providing packages with %{import_path} prefix. install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list +install -d -p %{buildroot}/%{gopath}/src/%{sec_import_path}/ +echo "%%dir %%{gopath}/src/%%{sec_import_path}/." >> devel.file-list install -d -p %{buildroot}/%{gopath}/src/%{gopkg_import_path}/ echo "%%dir %%{gopath}/src/%%{gopkg_import_path}/." >> devel.file-list install -d -p %{buildroot}/%{gopath}/src/%{sec_gopkg_import_path}/ @@ -113,6 +130,11 @@ for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list + echo "%%dir %%{gopath}/src/%%{sec_import_path}/$(dirname $file)" >> devel.file-list + install -d -p %{buildroot}/%{gopath}/src/%{sec_import_path}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{sec_import_path}/$file + echo "%%{gopath}/src/%%{sec_import_path}/$file" >> devel.file-list + echo "%%dir %%{gopath}/src/%%{gopkg_import_path}/$(dirname $file)" >> devel.file-list install -d -p %{buildroot}/%{gopath}/src/%{gopkg_import_path}/$(dirname $file) cp -pav $file %{buildroot}/%{gopath}/src/%{gopkg_import_path}/$file @@ -169,10 +191,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test -f unit-test.file-list %license LICENSE -%doc CHANGELOG.md README.md CONTRIBUTING.md AUTHORS %endif %changelog +* Tue Jan 24 2017 Jan Chaloupka - 1.3.1-0.1.gitf12c623 +- Bump to upstream f12c6236fe7b5cf6bcf30e5935d08cb079d78334 + related: #1318299 + * Thu Jul 21 2016 Fedora Release Engineering - 1.2.0-0.5.git96c060f - https://fedoraproject.org/wiki/Changes/golang1.7 diff --git a/sources b/sources index e502d2a..0471fa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58afe086f44ae012c437930a3ab31352 fsnotify-96c060f.tar.gz +SHA512 (fsnotify-f12c623.tar.gz) = c2c68972898faba4303fc83f9544948d000e931bf610d9b6e2f91367836959201949a9dbe0dc713bc82d84abedcbdabfa24b1c71b4dbb2cc1aa11cb2f1a4b17e