From 0cf82caf52abed556092ce86f3f89302132fb706 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Apr 13 2017 20:13:37 +0000 Subject: s/it_docker_proxy/it_libnetwork/g macro rename Signed-off-by: Lokesh Mandvekar --- diff --git a/docker.spec b/docker.spec index 654f953..39ebf98 100644 --- a/docker.spec +++ b/docker.spec @@ -77,9 +77,9 @@ %global shortcommit_lvm %(c=%{commit_lvm}; echo ${c:0:7}) # docker-proxy -%global git_docker_proxy https://github.com/docker/libnetwork -%global commit_docker_proxy 0f534354b813003a754606689722fe253101bc4e -%global shortcommit_docker_proxy %(c=%{commit_docker_proxy}; echo ${c:0:7}) +%global git_libnetwork https://github.com/docker/libnetwork +%global commit_libnetwork 0f534354b813003a754606689722fe253101bc4e +%global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini %global git_tini https://github.com/krallin/tini @@ -118,7 +118,7 @@ Source18: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortc Source19: %{git_lvm}/archive/%{commit_lvm}/%{repo}-lvm-plugin-%{shortcommit_lvm}.tar.gz Source20: %{repo}.service.centos Source21: %{repo}-containerd.service.centos -Source22: %{git_docker_proxy}/archive/%{commit_docker_proxy}/libnetwork-%{shortcommit_docker_proxy}.tar.gz +Source22: %{git_libnetwork}/archive/%{commit_libnetwork}/libnetwork-%{shortcommit_libnetwork}.tar.gz Source23: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz %if 0%{?with_debug} @@ -582,7 +582,7 @@ ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provi ln -s $(dirs +1 -l)/%{repo}-lvm-plugin-%{commit_lvm} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin popd -pushd libnetwork-%{commit_docker_proxy} +pushd libnetwork-%{commit_libnetwork} mkdir -p src/github.com/docker/libnetwork ln -s $(pwd)/* src/github.com/docker/libnetwork export GOPATH=$(pwd) @@ -655,7 +655,7 @@ install -p -m 755 bundles/latest/dynbinary-daemon/%{repo}d-%{version}* %{buildro # install docker-proxy install -d %{buildroot}%{_libexecdir}/%{repo} -install -p -m 755 libnetwork-%{commit_docker_proxy}/docker-proxy %{buildroot}%{_libexecdir}/%{repo}/%{repo}-proxy-current +install -p -m 755 libnetwork-%{commit_libnetwork}/docker-proxy %{buildroot}%{_libexecdir}/%{repo}/%{repo}-proxy-current # install manpages install -d %{buildroot}%{_mandir}/man1