[docker-io] Remove hardcoded install paths for devel
Lokesh Mandvekar
lsm5 at fedoraproject.org
Fri Feb 27 04:13:10 UTC 2015
commit 3269313853dbf3eaf32ebf3e6c36d20c1ce2db0c
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date: Thu Feb 26 01:06:50 2015 -0600
Remove hardcoded install paths for devel
- add version-release to devel package
Provides, also Provide: tar_import_path
- use wildcard to install all source files in -devel
Signed-off-by: Lokesh Mandvekar <lsm5 at fedoraproject.org>
docker-io.spec | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 55f9ddc..f477efb 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -71,9 +71,10 @@ servers, OpenStack clusters, public instances, or combinations of the above.
%package devel
BuildRequires: golang >= 1.2.1-3
Requires: golang >= 1.2.1-3
-Provides: %{repo}-devel
-Provides: %{name}-pkg-devel
-Provides: %{repo}-pkg-devel
+Provides: %{repo}-devel = %{version}-%{release}
+Provides: %{name}-pkg-devel = %{version}-%{release}
+Provides: %{repo}-pkg-devel = %{version}-%{release}
+Provides: golang(%{import_path}/vendor/src/%{tar_import_path}) = %{version}-%{release}
Summary: A golang registry for global request variables (source libraries)
Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/builder) = %{version}-%{release}
@@ -284,18 +285,18 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage
install -d -p %{buildroot}%{gopath}/src/%{import_path}
rm -rf pkg/symlink/testdata
-for dir in api builder builtins contrib/docker-device-tool \
- contrib/host-integration daemon docker dockerinit \
- engine events graph \
- image links nat opts pkg registry runconfig \
- trust utils volumes
-do
- cp -rpav $dir %{buildroot}%{gopath}/src/%{import_path}/
-done
-
+# install tar_import_path to devel package
install -d -p %{buildroot}%{gopath}/src/%{import_path}/vendor/src/%{tar_import_path}
cp -rpav vendor/src/%{tar_import_path}/* %{buildroot}%{gopath}/src/%{import_path}/vendor/src/%{tar_import_path}
+# remove dirs that won't be installed in devel
+rm -rf vendor docs _build bundles contrib/init hack project
+
+# install sources to devel
+for dir in */ ; do
+ cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
+done
+
# install docker config directory
install -dp %{buildroot}%{_sysconfdir}/%{repo}
More information about the scm-commits
mailing list