jpopelka pushed to dock (f21). "rebuilt"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 19 16:19:32 UTC 2015
From 5d145a5c0a96191ae5100413def9567af3b46e2a Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka at redhat.com>
Date: Tue, 19 May 2015 18:13:40 +0200
Subject: rebuilt
diff --git a/dock.spec b/dock.spec
index 78b424e..10102f9 100644
--- a/dock.spec
+++ b/dock.spec
@@ -1,4 +1,4 @@
-%global with_python3 0
+%global with_python3 1
%global owner DBuildService
%global project dock
@@ -8,7 +8,7 @@
Name: dock
Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Improved builder for Docker images
Group: Development/Tools
@@ -20,60 +20,74 @@ BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
-Requires: python-setuptools
+Requires: python-dock
+
+Requires: git >= 1.7.10
%if 0%{?with_python3}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
%endif
-Requires: python-docker-py
-Requires: GitPython
-Requires: python-requests
-
%description
-Simple python library with command line interface for building docker
+Simple Python tool with command line interface for building docker
images. It contains a lot of helpful functions which you would
probably implement if you started hooking docker into your
infrastructure.
-%package koji
+%package -n python-dock-koji
Summary: Koji plugin for Dock
Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
+Requires: python-dock = %{version}-%{release}
Requires: koji
+Provides: dock-koji = %{version}-%{release}
+Obsoletes: dock-koji < 1.2.0-3
-%description koji
+%description -n python-dock-koji
Koji plugin for Dock
-%package metadata
+%package -n python-dock-metadata
Summary: Plugin for submitting metada to OSBS
Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
+Requires: python-dock = %{version}-%{release}
Requires: osbs
+Provides: dock-metadata = %{version}-%{release}
+Obsoletes: dock-metadata < 1.2.0-3
-%description metadata
+%description -n python-dock-metadata
Plugin for submitting metada to OSBS
+%package -n python-dock
+Summary: Python 2 Dock library
+Group: Development/Tools
+License: BSD
+Requires: python-docker-py
+Requires: python-requests
+Requires: python-setuptools
+Requires: GitPython
+
+%description -n python-dock
+Simple Python 2 library for building docker images. It contains
+a lot of helpful functions which you would probably implement if
+you started hooking docker into your infrastructure.
+
+
%if 0%{?with_python3}
%package -n python3-dock
-Summary: Improved builder for Docker images
+Summary: Python 3 Dock library
Group: Development/Tools
License: BSD
Requires: python3-docker-py
Requires: python3-requests
Requires: python3-setuptools
-# python3 build is missing for GitPython
-Requires: GitPython
%description -n python3-dock
-Simple python library with command line interface for building docker
-images. It contains a lot of helpful functions which you would
-probably implement if you started hooking docker into your
-infrastructure.
+Simple Python 3 library for building docker images. It contains
+a lot of helpful functions which you would probably implement if
+you started hooking docker into your infrastructure.
%package -n python3-dock-koji
@@ -89,10 +103,10 @@ Koji plugin for Dock
%package -n python3-dock-metadata
Summary: Plugin for submitting metada to OSBS
Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
+Requires: python3-dock = %{version}-%{release}
Requires: osbs
-%description python3-dock-metadata
+%description -n python3-dock-metadata
Plugin for submitting metada to OSBS
%endif # with_python3
@@ -125,6 +139,8 @@ popd
%endif # with_python3
%{__python} setup.py install --skip-build --root %{buildroot}
+mv %{buildroot}%{_bindir}/dock %{buildroot}%{_bindir}/dock2
+ln -s %{_bindir}/dock2 %{buildroot}%{_bindir}/dock
# ship dock in form of tarball so it can be installed within build image
cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
@@ -134,22 +150,29 @@ cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
%doc README.md
%license LICENSE
%{_bindir}/dock
+
+
+%files -n python-dock
+%doc README.md
+%license LICENSE
+%{_bindir}/dock2
%dir %{python2_sitelib}/dock
%{python2_sitelib}/dock/*.*
%{python2_sitelib}/dock/cli
%{python2_sitelib}/dock/plugins
%exclude %{python2_sitelib}/dock/plugins/pre_koji.py*
+%exclude %{python2_sitelib}/dock/plugins/post_store_metadata_in_osv3.py*
%{python2_sitelib}/dock-%{version}-py2.*.egg-info
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/dock.tar.gz
%{_datadir}/%{name}/images
-%files koji
+%files -n python-dock-koji
%{python2_sitelib}/dock/plugins/pre_koji.py*
-%files metadata
+%files -n python-dock-metadata
%{python2_sitelib}/dock/plugins/post_store_metadata_in_osv3.py*
@@ -162,8 +185,11 @@ cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
%{python3_sitelib}/dock/*.*
%{python3_sitelib}/dock/cli
%{python3_sitelib}/dock/plugins
+%{python3_sitelib}/dock/__pycache__/*.py*
%exclude %{python3_sitelib}/dock/plugins/pre_koji.py*
-%{python3_sitelib}/dock-%{version}-py2.*.egg-info
+%exclude %{python3_sitelib}/dock/plugins/__pycache__/pre_koji*.py*
+%exclude %{python3_sitelib}/dock/plugins/__pycache__/post_store_metadata_in_osv3*.py*
+%{python3_sitelib}/dock-%{version}-py3.*.egg-info
%dir %{_datadir}/%{name}
# ship dock in form of tarball so it can be installed within build image
%{_datadir}/%{name}/dock.tar.gz
@@ -175,17 +201,30 @@ cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
%files -n python3-dock-koji
%{python3_sitelib}/dock/plugins/pre_koji.py*
+%{python3_sitelib}/dock/plugins/__pycache__/pre_koji*.py*
%files -n python3-dock-metadata
%{python3_sitelib}/dock/plugins/post_store_metadata_in_osv3.py*
+%{python3_sitelib}/dock/plugins/__pycache__/post_store_metadata_in_osv3*.py*
%endif # with_python3
%changelog
+* Tue May 19 2015 Jiri Popelka <jpopelka at redhat.com> - 1.2.1-2
+- rebuilt
+
* Tue May 19 2015 Martin Milata <mmilata at redhat.com> - 1.2.1-1
- new upstream release 1.2.1
+* Thu May 14 2015 Jiri Popelka <jpopelka at redhat.com> - 1.2.0-4
+- enable Python 3 build
+
+* Thu May 07 2015 Slavek Kabrda <bkabrda at redhat.com> - 1.2.0-3
+- Introduce python-dock subpackage
+- Rename dock-{koji,metadata} to python-dock-{koji,metadata}
+- move /usr/bin/dock to /usr/bin/dock2, /usr/bin/dock is now a symlink
+
* Tue May 05 2015 Jiri Popelka <jpopelka at redhat.com> - 1.2.0-2
- require python[3]-setuptools
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/dock.git/commit/?h=f21&id=5d145a5c0a96191ae5100413def9567af3b46e2a
More information about the scm-commits
mailing list