diff --git a/golang-apache-thrift.spec b/golang-apache-thrift.spec index e7e0f87..1c4eab4 100644 --- a/golang-apache-thrift.spec +++ b/golang-apache-thrift.spec @@ -1,7 +1,9 @@ # Run tests in check section %bcond_with check -%global goipath git.apache.org/thrift.git +%global oldgoipath git.apache.org/thrift.git +%global oldgoname %gorpmname %{oldgoipath} +%global goipath github.com/apache/thrift %global forgeurl https://github.com/apache/thrift Version: 0.12.0 @@ -15,8 +17,8 @@ abstracted stack to build interoperable RPC clients and servers.} %gometa -Name: %{goname} -Release: 1%{?dist} +Name: %{oldgoname} +Release: 2%{?dist} Summary: Thrift Go Software Library License: ASL 2.0 URL: %{gourl} @@ -28,16 +30,28 @@ BuildRequires: golang(github.com/golang/mock/gomock) %{common_description} -%package devel +%package -n %{oldgoname}-devel Summary: %{summary} BuildArch: noarch -%description devel +%description -n %{oldgoname}-devel %{common_description} This package contains library source intended for building other packages which use import path with -%{goipath} prefix. +%{oldgoipath} prefix. + + +%package -n %{goname}-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{goname}-devel +%{common_description} + +This package contains compatibility glue for code that still imports the +%{goipath} Go namespace. + %prep %forgeautosetup @@ -50,6 +64,9 @@ rm -rf lib/go/test %install %goinstall +install -m 0755 -vd %{buildroot}%{gopath}/src/%(dirname %{oldgoipath}) +ln -s %{gopath}/src/%{goipath} %{buildroot}%{gopath}/src/%{oldgoipath} + %if %{with check} %check @@ -57,12 +74,20 @@ rm -rf lib/go/test %endif -%files devel -f devel.file-list +%files -n %{oldgoname}-devel +%dir %{gopath}/src/%(dirname %{oldgoipath}) +%{gopath}/src/%{oldgoipath} + + +%files -n %{goname}-devel -f devel.file-list %license LICENSE %doc README.md LANGUAGES.md CONTRIBUTING.md %changelog +* Sun Mar 17 2019 Robert-André Mauchin - 0.12.0-2 +- Add github.com/apache/thrift as alternate import path + * Sat Mar 09 2019 Robert-André Mauchin - 0.12.0-1 - Release 0.12.0