mmilata pushed to dock (master). "new upstream release 1.1.2"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 2 15:49:10 UTC 2015


>From 63dccdf30ac2073001875eecd1229b970a022140 Mon Sep 17 00:00:00 2001
From: Martin Milata <mmilata at srck.net>
Date: Thu, 2 Apr 2015 17:28:56 +0200
Subject: new upstream release 1.1.2


diff --git a/.gitignore b/.gitignore
index 60b3ef2..74626b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /dock-4bd2f17017a62184d43da1bb689110c9562b0956.tar.gz
+/dock-83b187ecc4b19ef993038e0459c69264b9b4a5c3.tar.gz
diff --git a/dock.spec b/dock.spec
index 608b82b..b3ededf 100644
--- a/dock.spec
+++ b/dock.spec
@@ -3,11 +3,11 @@
 %global owner DBuildService
 %global project dock
 
-%global commit 4bd2f17017a62184d43da1bb689110c9562b0956
+%global commit 83b187ecc4b19ef993038e0459c69264b9b4a5c3
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           dock
-Version:        1.1.0
+Version:        1.1.2
 Release:        1%{?dist}
 
 Summary:        Improved builder for Docker images
@@ -93,18 +93,21 @@ pushd %{py3dir}
 popd
 %endif # with_python3
 
+
 %install
-mkdir -vp %{buildroot}/%{_datadir}/%{name}
-# install python package
-%{__python} setup.py install --skip-build --root %{buildroot}
-# ship dock in form of tarball so it can be installed within build image
-cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
 %if 0%{?with_python3}
 pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root %{buildroot}
+mv %{buildroot}%{_bindir}/dock %{buildroot}%{_bindir}/dock3
 popd
 %endif # with_python3
 
+%{__python} setup.py install --skip-build --root %{buildroot}
+
+# ship dock in form of tarball so it can be installed within build image
+cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
+
+
 %files
 %doc README.md
 %license LICENSE
@@ -128,7 +131,7 @@ popd
 %files -n python3-dock
 %doc README.md
 %license LICENSE
-%{_bindir}/dock
+%{_bindir}/dock3
 %dir %{python3_sitelib}/dock
 %{python3_sitelib}/dock/*.*
 %{python3_sitelib}/dock/cli
@@ -150,6 +153,15 @@ popd
 
 
 %changelog
+* Thu Apr 02 2015 Martin Milata <mmilata at redhat.com> - 1.1.2-1
+- new upstream release 1.1.2
+
+* Thu Mar 19 2015 Jiri Popelka <jpopelka at redhat.com> - 1.1.1-2
+- separate executable for python 3
+
+* Tue Mar 17 2015 Tomas Tomecek <ttomecek at redhat.com> - 1.1.1-1
+- new upstream release 1.1.1
+
 * Fri Feb 20 2015 Tomas Tomecek <ttomecek at redhat.com> - 1.1.0-1
 - new upstream release 1.1.0
 
diff --git a/sources b/sources
index 6a871f6..bda3fba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b688011a9c4e74ffd37f61022e2cca99  dock-4bd2f17017a62184d43da1bb689110c9562b0956.tar.gz
+f20e64e5bedcd613d42aa0f6a02ffbc3  dock-83b187ecc4b19ef993038e0459c69264b9b4a5c3.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/dock.git/commit/?h=master&id=63dccdf30ac2073001875eecd1229b970a022140


More information about the scm-commits mailing list