Subject: jchaloup pushed to golang-github-jtolds-gls
(epel7). "Update to spec-2.1 (..more)"



From 6a83a63201432899fe704192d3e24311867dc09e Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <[email protected]>
Date: Sat, 12 Sep 2015 23:36:25 +0200
Subject: Update to spec-2.1 - related: #1250490

---
golang-github-jtolds-gls.spec | 80 ++++++++++++++++++-------------------------
1 file changed, 34 insertions(+), 46 deletions(-)

diff --git a/golang-github-jtolds-gls.spec b/golang-github-jtolds-gls.spec
index 8c4f526..b1c7104 100644
--- a/golang-github-jtolds-gls.spec
+++ b/golang-github-jtolds-gls.spec
@@ -18,13 +18,6 @@
%global debug_package %{nil}
%endif

-%define copying() \
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \
-%license %{*} \
-%else \
-%doc %{*} \
-%endif
-
%global provider github
%global provider_tld com
%global project jtolds
@@ -37,24 +30,16 @@

Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.2.git%{shortcommit}%{?dist}
+Release: 0.3.git%{shortcommit}%{?dist}
Summary: Goroutine local storage
License: MIT
URL: https://%{provider_prefix}
Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz

-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%ifarch 0%{?gccgo_arches}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
+# 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}}
+# 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}

%description
%{summary}
@@ -77,21 +62,11 @@ building other packages which use import path with
%{import_path} prefix.
%endif

-%if 0%{?with_unit_test}
+%if 0%{?with_unit_test} && 0%{?with_devel}
%package unit-test
Summary: Unit tests for %{name} package
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%ifarch 0%{?gccgo_arches}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
+# 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
@@ -117,8 +92,10 @@ providing packages with %{import_path} prefix.
# 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" \! -iname "*_test.go") ; do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >>
devel.file-list
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
@@ -126,47 +103,57 @@ done
%endif

# testing files for this project
-%if 0%{?with_unit_test}
+%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.file-list
for file in $(find . -iname "*_test.go"); do
+ echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >>
devel.file-list
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
done
%endif

+%if 0%{?with_devel}
+sort -u -o devel.file-list devel.file-list
+%endif
+
%check
%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%ifarch 0%{?gccgo_arches}
-function gotest { %{gcc_go_test} "$@"; }
-%else
-%if 0%{?golang_test:1}
-function gotest { %{golang_test} "$@"; }
+%if ! 0%{?with_bundled}
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%else
-function gotest { go test "$@"; }
+export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%endif
+
+%if ! 0%{?gotest:1}
+%global gotest go test
%endif

-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-gotest %{import_path}
+%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
-%copying LICENSE
+%license LICENSE
%doc README.md
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%dir %{gopath}/src/%{import_path}
%endif

-%if 0%{?with_unit_test}
+%if 0%{?with_unit_test} && 0%{?with_devel}
%files unit-test -f unit-test.file-list
-%copying LICENSE
+%license LICENSE
%doc README.md
%endif

%changelog
+* Sat Sep 12 2015 jchaloup <[email protected]> - 0-0.3.git9a4a02d
+- Update to spec-2.1
+ related: #1250490
+
* Thu Aug 06 2015 Fridolin Pokorny <[email protected]> - 0-0.2.git9a4a02d
- Update spec file to spec-2.0
resolves: #1250490
@@ -175,3 +162,4 @@ gotest %{import_path}
- First package for Fedora
resolves: #1214809

+
--
cgit v0.12



http://pkgs.fedoraproject.org/cgit/golang-github-jtolds-gls.git/commit/?h=epel7&id=6a83a63201432899fe704192d3e24311867dc09e
_______________________________________________
scm-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]


Programming list archiving by: Enterprise Git Hosting