From ee69e29ed837a45a7d825856ac0adf59b3ab8a4a Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Aug 20 2015 06:55:10 +0000 Subject: Fix %%files devel section Fix BR and R, change import path prefix to code.google.com/p - related: #1250519 --- diff --git a/golang-googlecode-go-exp.spec b/golang-googlecode-go-exp.spec index 5646052..d313daa 100644 --- a/golang-googlecode-go-exp.spec +++ b/golang-googlecode-go-exp.spec @@ -40,7 +40,7 @@ Name: golang-googlecode-go-exp Version: 0 -Release: 0.6.git%{shortcommit}%{?dist} +Release: 0.7.git%{shortcommit}%{?dist} Summary: Experimental tools and packages for Go License: BSD URL: https://%{provider_prefix} @@ -68,12 +68,12 @@ Summary: %{summary} BuildArch: noarch %if 0%{?with_check} -BuildRequires: golang(golang.org/x/text/collate/colltab) -BuildRequires: golang(golang.org/x/text/language) +BuildRequires: golang(code.google.com/p/go.text/collate/colltab) +BuildRequires: golang(code.google.com/p/go.text/language) %endif -Requires: golang(golang.org/x/text/collate/colltab) -Requires: golang(golang.org/x/text/language) +Requires: golang(code.google.com/p/go.text/collate/colltab) +Requires: golang(code.google.com/p/go.text/language) Provides: golang(%{gc_import_path}/ebnf) = %{version}-%{release} Provides: golang(%{gc_import_path}/fsnotify) = %{version}-%{release} @@ -174,6 +174,11 @@ for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do cp -pav $file %{buildroot}/%{gopath}/src/%{gc_import_path}/$file echo "%%{gopath}/src/%%{gc_import_path}/$file" >> gc_devel.file-list done +pushd %{buildroot}/%{gopath}/src/%{gc_import_path}/ +# from https://groups.google.com/forum/#!topic/golang-nuts/eD8dh3T9yyA, first post +sed -i 's/"golang\.org\/x\//"code\.google\.com\/p\/go\./g' \ + $(find . -name '*.go') +popd %endif # testing files for this project @@ -219,7 +224,7 @@ gotest %{import_path}/utf8string %doc README AUTHORS CONTRIBUTORS PATENTS %dir %{gopath}/src/%{gc_import_path} -%files devel -f devel.file-list +%files -n %{gi_name}-devel -f devel.file-list %copying LICENSE %doc README AUTHORS CONTRIBUTORS PATENTS %dir %{gopath}/src/%{import_path} @@ -232,6 +237,11 @@ gotest %{import_path}/utf8string %endif %changelog +* Thu Aug 20 2015 jchaloup - 0-0.7.gite1eb486 +- Fix %%files devel section +- Fix BR and R, change import path prefix to code.google.com/p + related: #1250519 + * Wed Aug 19 2015 jchaloup - Update spec file to spec-2.0 resolves: #1250519