From ef4b577cb49e19ec7e6bf96996ce0aff946a8a83 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: May 08 2015 05:18:59 +0000 Subject: include distro tag in VERSION file NVR: docker-1.7.0-6.git56481a3 - This will let 'docker version' display the distro version as well which is helpful in finding out if the docker rpm is distro supplied or provided by upstream docker Signed-off-by: Lokesh Mandvekar --- diff --git a/docker.spec b/docker.spec index 064d48d..6961d28 100644 --- a/docker.spec +++ b/docker.spec @@ -45,7 +45,7 @@ Name: %{repo} Version: 1.7.0 -Release: 5.git%{d_shortcommit}%{?dist} +Release: 6.git%{d_shortcommit}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: http://www.%{repo}.com @@ -263,6 +263,7 @@ This package installs %{summary}. %prep %autosetup -Sgit -n %{repo}-%{d_commit} cp %{SOURCE5} . +sed -i 's/$/%{?dist}/' VERSION %if 0%{?with_selinux} # unpack %{repo}-selinux @@ -296,9 +297,9 @@ install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_libexecdir}/%{repo} # Grab the first thing from -dev -for x in bundles/*-dev; do \ - install -p -m 755 $x/dynbinary/%{repo}-*-dev %{buildroot}%{_bindir}/%{repo} - install -p -m 755 $x/dynbinary/%{repo}init-*-dev %{buildroot}%{_libexecdir}/%{repo}/%{repo}init +for x in bundles/*-dev%{?dist}; do \ + install -p -m 755 $x/dynbinary/%{repo}-*-dev%{?dist} %{buildroot}%{_bindir}/%{repo} + install -p -m 755 $x/dynbinary/%{repo}init-*-dev%{?dist} %{buildroot}%{_libexecdir}/%{repo}/%{repo}init break done @@ -475,6 +476,9 @@ fi %{_datadir}/zsh/site-functions/_%{repo} %changelog +* Fri May 08 2015 Lokesh Mandvekar - 1.7.0-6.git56481a3 +- include distro tag in VERSION + * Thu Apr 30 2015 Lokesh Mandvekar - 1.7.0-5.git56481a3 - include docker-selinux for centos7 and rhel7