[docker-io] install: Don't use %{version}
Colin Walters
walters at fedoraproject.org
Wed Mar 11 17:38:07 UTC 2015
commit b4a9706960d2827ddbf43d13079e176b2309094c
Author: Colin Walters <walters at verbum.org>
Date: Wed Mar 11 11:39:25 2015 -0400
install: Don't use %{version}
rpmdistro-gitoverlay injects the output of "git describe" as the
version field - and it looks like docker git master made the v1.5.0
release commit on a branch. This means the version ends up being
v1.4.1-1554-g8305440
which breaks as we actually want 1.5.
Using a glob here works.
docker-io.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index ccccc69..9741f8c 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -228,11 +228,14 @@ cp contrib/syntax/vim/README.md README-vim-syntax.md
%install
# install binary
install -d %{buildroot}%{_bindir}
-install -p -m 755 bundles/%{version}-dev/dynbinary/docker-%{version}-dev %{buildroot}%{_bindir}/docker
-
-# install dockerinit
install -d %{buildroot}%{_libexecdir}/docker
-install -p -m 755 bundles/%{version}-dev/dynbinary/dockerinit-%{version}-dev %{buildroot}%{_libexecdir}/docker/dockerinit
+
+# Grab the first thing from -dev
+for x in bundles/*-dev; do \
+ install -p -m 755 $x/dynbinary/docker-*-dev %{buildroot}%{_bindir}/docker
+ install -p -m 755 $x/dynbinary/dockerinit-*-dev %{buildroot}%{_libexecdir}/docker/dockerinit
+ break
+done
# install manpages
install -d %{buildroot}%{_mandir}/man1
More information about the scm-commits
mailing list