commit 8d75072192c57f4799354879b32359c95e2b4269 Author: Jan Chaloupka jchaloup@redhat.com Date: Fri Nov 21 13:42:59 2014 +0100
Extend import paths for golang.org/x/ Choose the correct architecture - related: #1056285
golang-googlecode-text.spec | 75 +++++++++++++++++++++++++++++++++++------- 1 files changed, 62 insertions(+), 13 deletions(-) --- diff --git a/golang-googlecode-text.spec b/golang-googlecode-text.spec index 1ef0031..cb802ac 100644 --- a/golang-googlecode-text.spec +++ b/golang-googlecode-text.spec @@ -8,14 +8,24 @@ %global rev 024681b033bea960a9312d2420f5c942d4a3a7f0 %global shortrev %(r=%{rev}; echo ${r:0:12})
+%global x_provider golang +%global x_provider_tld org +%global x_repo text +%global x_import_path %{x_provider}.%{x_provider_tld}/x/%{x_repo} +%global x_name golang-%{x_provider}%{x_provider_tld}-%{repo} + Name: golang-%{provider}%{provider_prefix}-%{repo} Version: 0 -Release: 0.1.hg%{shortrev}%{?dist} +Release: 0.2.hg%{shortrev}%{?dist} Summary: Supplementary Go text libraries License: CC-BY URL: http://%%7Bimport_path%7D Source0: https://%%7Brepo%7D.go.%%7Bprovider%7D%%7Bprovider_prefix%7D.%%7Bprovider_tl... +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +BuildArch: noarch +%else ExclusiveArch: %{ix86} x86_64 %{arm} +%endif
%description %{summary} @@ -23,7 +33,7 @@ ExclusiveArch: %{ix86} x86_64 %{arm} %package devel BuildRequires: golang >= 1.2.1-3 Requires: golang >= 1.2.1-3 -Summary: Supplementary Go text libraries +Summary: Supplementary Go text libraries for code.google.com/p/ imports Provides: golang(%{import_path}/cldr) = %{version}-%{release} Provides: golang(%{import_path}/collate) = %{version}-%{release} Provides: golang(%{import_path}/collate/build) = %{version}-%{release} @@ -43,11 +53,39 @@ Provides: golang(%{import_path}/language) = %{version}-%{release} Provides: golang(%{import_path}/transform) = %{version}-%{release} Provides: golang(%{import_path}/unicode/norm) = %{version}-%{release}
+%package -n %{x_name}-devel +BuildRequires: golang >= 1.2.1-3 +Requires: golang >= 1.2.1-3 +Summary: Supplementary Go text libraries for golang.org/x/ imports +Provides: golang(%{x_import_path}/cldr) = %{version}-%{release} +Provides: golang(%{x_import_path}/collate) = %{version}-%{release} +Provides: golang(%{x_import_path}/collate/build) = %{version}-%{release} +Provides: golang(%{x_import_path}/collate/colltab) = %{version}-%{release} +Provides: golang(%{x_import_path}/collate/tools/colcmp) = %{version}-%{release} +Provides: golang(%{x_import_path}/display) = %{version}-%{release} +Provides: golang(%{x_import_path}/encoding) = %{version}-%{release} +Provides: golang(%{x_import_path}/encoding/charmap) = %{version}-%{release} +Provides: golang(%{x_import_path}/encoding/japanese) = %{version}-%{release} +Provides: golang(%{x_import_path}/encoding/korean) = %{version}-%{release} +Provides: golang(%{x_import_path}/encoding/simplifiedchinese) = %{version}-%{release} +Provides: golang(%{x_import_path}/encoding/traditionalchinese) = %{version}-%{release} +Provides: golang(%{x_import_path}/encoding/unicode) = %{version}-%{release} +Provides: golang(%{x_import_path}/internal/triegen) = %{version}-%{release} +Provides: golang(%{x_import_path}/internal/ucd) = %{version}-%{release} +Provides: golang(%{x_import_path}/language) = %{version}-%{release} +Provides: golang(%{x_import_path}/transform) = %{version}-%{release} +Provides: golang(%{x_import_path}/unicode/norm) = %{version}-%{release} + %description devel %{summary}
This package contains library source intended for building other packages -which use the supplementary Go text libraries. +which use the supplementary Go text libraries with code.google.com/p/ imports. + +%description -n %{x_name}-devel + +This package contains library source intended for building other packages +which use the supplementary Go text libraries with golang.org/x/ imports.
%prep %setup -qn %{repo}.go-%{shortrev} @@ -55,13 +93,23 @@ which use the supplementary Go text libraries. %build
%install + install -dp %{buildroot}%{gopath}/src/%{import_path} +install -dp %{buildroot}%{gopath}/src/%{x_import_path} for dir in */ ; do cp -rpav $dir %{buildroot}%{gopath}/src/%{import_path}/ + cp -rpav $dir %{buildroot}%{gopath}/src/%{x_import_path}/ done
+cd %{buildroot}/%{gopath}/src/%{x_import_path} +# from https://groups.google.com/forum/#!topic/golang-nuts/eD8dh3T9yyA, first post +sed -i 's/"code.google.com/p/go./"golang.org/x//g' \ + $(find . -name '*.go') + + %check for dir in $(find . -mindepth 0 -maxdepth 3 -type d); do +break # test fails for transform if [[ $(find $dir -maxdepth 1 -name *_test.go | wc -l) != '0' && $dir != "./transform" ]]; then GOPATH=%{gopath}:%{buildroot}%{gopath} go test %{import_path}/$dir @@ -71,20 +119,21 @@ done
# delete encoding/testdata rm -rf %{buildroot}%{gopath}/src/%{import_path}/encoding/testdata +rm -rf %{buildroot}%{gopath}/src/%{x_import_path}/encoding/testdata
%files devel %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README -%dir %{gopath}/src/%{import_path} -%dir %{gopath}/src/%{import_path}/* -%dir %{gopath}/src/%{import_path}/*/* -%dir %{gopath}/src/%{import_path}/*/*/* -%{gopath}/src/%{import_path}/*/Makefile -%{gopath}/src/%{import_path}/*/*/Makefile -%{gopath}/src/%{import_path}/*/*/*/Makefile -%{gopath}/src/%{import_path}/*/*.go -%{gopath}/src/%{import_path}/*/*/*.go -%{gopath}/src/%{import_path}/*/*/*/*.go +%{gopath}/src/%{import_path} + +%files -n %{x_name}-devel +%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README +%{gopath}/src/%{x_import_path}
%changelog +* Fri Nov 21 2014 jchaloup jchaloup@redhat.com - 0-0.2.hg024681b033be +- Extend import paths for golang.org/x/ +- Choose the correct architecture + related: #1056285 + * Sun Sep 28 2014 Lokesh Mandvekar lsm5@fedoraproject.org - 0-0.1.hg024681b033be - Resolves: rhbz#1056285 - Initial package
golang@lists.fedoraproject.org