diff --git a/change-import-path-of-go.net.patch b/change-import-path-of-go.net.patch index cd8c54f..1b262e5 100644 --- a/change-import-path-of-go.net.patch +++ b/change-import-path-of-go.net.patch @@ -1,6 +1,6 @@ -From c5bd3da1e38694687503a1e94b54acfe59bea4ec Mon Sep 17 00:00:00 2001 +From e2934e04352c802de629c2038be834d40bfcf326 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Wed, 15 Apr 2015 16:51:16 +0200 +Date: Wed, 28 Feb 2018 20:20:59 +0100 Subject: [PATCH] change import path of go.net --- @@ -8,7 +8,7 @@ Subject: [PATCH] change import path of go.net 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client.go b/client.go -index a7359ae..48cc6d1 100644 +index a7359ae..766a763 100644 --- a/client.go +++ b/client.go @@ -8,8 +8,8 @@ import ( @@ -17,11 +17,11 @@ index a7359ae..48cc6d1 100644 - "github.com/hashicorp/go.net/ipv4" - "github.com/hashicorp/go.net/ipv6" -+ "code.google.com/p/go.net/ipv4" -+ "code.google.com/p/go.net/ipv6" ++ "golang.org/x/net/ipv4" ++ "golang.org/x/net/ipv6" "github.com/miekg/dns" ) -- -1.9.3 +2.7.5 diff --git a/golang-github-hashicorp-mdns.spec b/golang-github-hashicorp-mdns.spec index 492c5f7..9d48b82 100644 --- a/golang-github-hashicorp-mdns.spec +++ b/golang-github-hashicorp-mdns.spec @@ -1,165 +1,59 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 1 -%global with_bundled 0 -%global with_debug 0 -# Tests need Internet access -%global with_check 0 -%global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 0 -%global with_debug 0 -%global with_check 0 -%global with_unit_test 0 -%endif - -%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 hashicorp -%global repo mdns -# https://github.com/hashicorp/mdns -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +# http://github.com/hashicorp/mdns +%global provider_prefix github.com/hashicorp/mdns +%global gobaseipath %{provider_prefix} %global commit 2b439d37011456df8ff83a70ffd1cd6046410113 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20150317 -Name: golang-%{provider}-%{project}-%{repo} +%gocraftmeta -i + +Name: %{goname} Version: 0 -Release: 0.11.git%{shortcommit}%{?dist} +Release: 0.12.%{commitdate}git%{shortcommit}%{?dist} Summary: Simple mDNS client/server library in Golang License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +URL: %{gourl} +Source0: %{gosource} Patch0: change-import-path-of-go.net.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 %{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} -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} -BuildRequires: golang(code.google.com/p/go.net/ipv4) -BuildRequires: golang(code.google.com/p/go.net/ipv6) +BuildRequires: golang(golang.org/x/net/ipv4) +BuildRequires: golang(golang.org/x/net/ipv6) BuildRequires: golang(github.com/miekg/dns) -%endif - -Requires: golang(code.google.com/p/go.net/ipv4) -Requires: golang(code.google.com/p/go.net/ipv6) -Requires: golang(github.com/miekg/dns) - -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 -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 -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%description unit-test -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +%{gobaseipath} prefix. %prep -%setup -q -n %{repo}-%{commit} +%gosetup %patch0 -p1 -%build - %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" \! -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 -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.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 +%goinstall %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} -%endif +%gochecks %{gobaseipath} #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 -f unit-test.file-list -%license LICENSE -%doc README.md -%endif %changelog +* Wed Feb 28 2018 Jan Chaloupka - 0-0.12.20150317git2b439d3 +- Autogenerate some parts using the new macros + * Wed Feb 07 2018 Fedora Release Engineering - 0-0.11.git2b439d3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild