From 6f505851b5180f39bc09c52f5da4164c09765166 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Mar 29 2017 08:03:00 +0000 Subject: Drop left over import_path_sec/mimport_path from the spec file --- diff --git a/golang-gopkg-retry-v1.spec b/golang-gopkg-retry-v1.spec index 8d3fdd9..a888026 100644 --- a/golang-gopkg-retry-v1.spec +++ b/golang-gopkg-retry-v1.spec @@ -64,8 +64,6 @@ Summary: %{summary} BuildArch: noarch Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path_sec}) = %{version}-%{release} -Provides: golang(%{mimport_path}) = %{version}-%{release} Provides: golang(%{gimport_path}) = %{version}-%{release} Obsoletes: golang-launchpad-gocheck-devel @@ -105,7 +103,6 @@ providing packages with %{import_path} prefix. # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/ install -d -p %{buildroot}/%{gopath}/src/%{gimport_path}/ # find all *.go but no *_test.go files and generate devel.file-list for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do @@ -113,10 +110,6 @@ for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do cp $file %{buildroot}/%{gopath}/src/%{import_path}/$file echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/$(dirname $file) - cp $file %{buildroot}/%{gopath}/src/%{import_path_sec}/$file - echo "%%{gopath}/src/%%{import_path_sec}/$file" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{gimport_path}/$(dirname $file) cp $file %{buildroot}/%{gopath}/src/%{gimport_path}/$file echo "%%{gopath}/src/%%{gimport_path}/$file" >> devel.file-list @@ -157,7 +150,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %license LICENSE %doc README.md %dir %{gopath}/src/%{import_path} -%dir %{gopath}/src/%{import_path_sec} %dir %{gopath}/src/%{gimport_path} %endif