diff --git a/golang-googlecode-net.spec b/golang-googlecode-net.spec index 1d8c4c1..7963946 100644 --- a/golang-googlecode-net.spec +++ b/golang-googlecode-net.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_tld com %global provider github %global project golang @@ -46,24 +39,16 @@ Name: golang-googlecode-net Version: 0 -Release: 0.25.git%{shortcommit}%{?dist} +Release: 0.26.git%{shortcommit}%{?dist} Summary: Supplementary Go networking libraries License: BSD 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} @@ -170,18 +155,6 @@ which use the supplementary Go text libraries with golang.org/x/ imports. %if 0%{?with_unit_test} %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 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests @@ -272,25 +245,33 @@ go test %{x_import_path}/webdav go test %{x_import_path}/websocket %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 AUTHORS CONTRIBUTORS PATENTS README CONTRIBUTING.md %dir %{gopath}/src/%{import_path} %files -n %{x_name}-devel -f x_devel.file-list -%copying LICENSE +%license LICENSE %doc AUTHORS CONTRIBUTORS PATENTS README CONTRIBUTING.md %dir %{gopath}/src/%{x_import_path} %endif %if 0%{?with_unit_test} %files unit-test -f unit-test.file-list -%copying LICENSE +%license LICENSE %doc AUTHORS CONTRIBUTORS PATENTS README CONTRIBUTING.md %endif %changelog +* Thu Sep 24 2015 Peter Robinson 0-0.6.git446d52d +- Change deps on compiler(go-compiler) +- Update Arches +- Use %%license + * Wed Jul 29 2015 jchaloup - 0-0.25.git446d52d - Update of spec file to spec-2.0 related: #1230677