diff --git a/.gitignore b/.gitignore index 4f42435..f079280 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /atomic-reactor-1.4.0.tar.gz /atomic-reactor-c5137664803035a6cfbe360c75a44ec208270e51.tar.gz +/atomic-reactor-0d0a9bae4e3efecbaa7a38ebc50855d6d6044768.tar.gz diff --git a/atomic-reactor.spec b/atomic-reactor.spec index 4623586..8a16dd2 100644 --- a/atomic-reactor.spec +++ b/atomic-reactor.spec @@ -14,13 +14,13 @@ %global owner projectatomic %global project atomic-reactor -%global commit c5137664803035a6cfbe360c75a44ec208270e51 +%global commit 0d0a9bae4e3efecbaa7a38ebc50855d6d6044768 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global dock_obsolete_vr 1.3.7-2 Name: %{project} -Version: 1.5.1 +Version: 1.6.0 Release: 1%{?dist} Summary: Improved builder for Docker images @@ -56,6 +56,25 @@ probably implement if you started hooking Docker into your infrastructure. +%package -n python-atomic-reactor +Summary: Python 2 Atomic Reactor library +Group: Development/Tools +License: BSD +Requires: python-docker-py +Requires: python-requests +Requires: python-setuptools +Requires: python-dockerfile-parse >= 0.0.5 +Requires: python-backports-lzma +# Due to CopyBuiltImageToNFSPlugin, might be moved to subpackage later. +Requires: nfs-utils +Provides: python-dock = %{version}-%{release} +Obsoletes: python-dock < %{dock_obsolete_vr} + +%description -n python-atomic-reactor +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. + %package -n python-atomic-reactor-koji Summary: Koji plugin for Atomic Reactor Group: Development/Tools @@ -84,26 +103,14 @@ Obsoletes: python-dock-metadata < %{dock_obsolete_vr} Plugin for submitting metadata to OSBS -%package -n python-atomic-reactor -Summary: Python 2 Atomic Reactor library +%package -n python-atomic-reactor-rebuilds +Summary: Plugins for automated rebuilds Group: Development/Tools -License: BSD -Requires: python-docker-py -Requires: python-requests -Requires: python-setuptools -Requires: python-dockerfile-parse >= 0.0.4 -Requires: python-backports-lzma -# Due to CopyBuiltImageToNFSPlugin, might be moved to subpackage later. -Requires: nfs-utils -# Due to BumpReleasePlugin -Requires: python-pygit2 -Provides: python-dock = %{version}-%{release} -Obsoletes: python-dock < %{dock_obsolete_vr} +Requires: python-atomic-reactor = %{version}-%{release} +Requires: osbs >= 0.15 -%description -n python-atomic-reactor -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. +%description -n python-atomic-reactor-rebuilds +Plugins for automated rebuilds %if 0%{?with_python3} @@ -114,11 +121,9 @@ License: BSD Requires: python3-docker-py Requires: python3-requests Requires: python3-setuptools -Requires: python3-dockerfile-parse >= 0.0.4 +Requires: python3-dockerfile-parse >= 0.0.5 # Due to CopyBuiltImageToNFSPlugin, might be moved to subpackage later. Requires: nfs-utils -# Due to BumpReleasePlugin -Requires: python3-pygit2 Provides: python3-dock = %{version}-%{release} Obsoletes: python3-dock < %{dock_obsolete_vr} @@ -150,6 +155,15 @@ Obsoletes: python3-dock-metadata < %{dock_obsolete_vr} %description -n python3-atomic-reactor-metadata Plugin for submitting metadata to OSBS + +%package -n python3-atomic-reactor-rebuilds +Summary: Plugins for automated rebuilds +Group: Development/Tools +Requires: python3-atomic-reactor = %{version}-%{release} +Requires: osbs >= 0.15 + +%description -n python3-atomic-reactor-rebuilds +Plugins for automated rebuilds %endif # with_python3 @@ -207,6 +221,11 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/ %{python2_sitelib}/atomic_reactor/plugins %exclude %{python2_sitelib}/atomic_reactor/plugins/pre_koji.py* %exclude %{python2_sitelib}/atomic_reactor/plugins/exit_store_metadata_in_osv3.py* +%exclude %{python2_sitelib}/atomic_reactor/plugins/post_import_image.py* +%exclude %{python2_sitelib}/atomic_reactor/plugins/pre_bump_release.py* +%exclude %{python2_sitelib}/atomic_reactor/plugins/pre_check_and_set_rebuild.py* +%exclude %{python2_sitelib}/atomic_reactor/plugins/pre_stop_autorebuild_if_disabled.py + %{python2_sitelib}/atomic_reactor-%{version}-py2.*.egg-info %dir %{_datadir}/%{name} %{_datadir}/%{name}/atomic-reactor.tar.gz @@ -220,6 +239,12 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/ %files -n python-atomic-reactor-metadata %{python2_sitelib}/atomic_reactor/plugins/exit_store_metadata_in_osv3.py* +%files -n python-atomic-reactor-rebuilds +%{python2_sitelib}/atomic_reactor/plugins/post_import_image.py* +%{python2_sitelib}/atomic_reactor/plugins/pre_bump_release.py* +%{python2_sitelib}/atomic_reactor/plugins/pre_check_and_set_rebuild.py* +%{python2_sitelib}/atomic_reactor/plugins/pre_stop_autorebuild_if_disabled.py + %if 0%{?with_python3} %files -n python3-atomic-reactor @@ -239,6 +264,11 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/ %exclude %{python3_sitelib}/atomic_reactor/plugins/pre_koji.py* %exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_koji*.py* %exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/exit_store_metadata_in_osv3*.py* +%exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/post_import_image*.py* +%exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_bump_release*.py* +%exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_check_and_set_rebuild*.py* +%exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_stop_autorebuild_if_disabled*.py* + %{python3_sitelib}/atomic_reactor-%{version}-py3.*.egg-info %dir %{_datadir}/%{name} # ship reactor in form of tarball so it can be installed within build image @@ -257,10 +287,21 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/ %files -n python3-atomic-reactor-metadata %{python3_sitelib}/atomic_reactor/plugins/exit_store_metadata_in_osv3.py* %{python3_sitelib}/atomic_reactor/plugins/__pycache__/exit_store_metadata_in_osv3*.py* + +%files -n python3-atomic-reactor-rebuilds +%{python3_sitelib}/atomic_reactor/plugins/exit_store_metadata_in_osv3.py* +%{python3_sitelib}/atomic_reactor/plugins/__pycache__/exit_store_metadata_in_osv3*.py* +%{python3_sitelib}/atomic_reactor/plugins/__pycache__/post_import_image*.py* +%{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_bump_release*.py* +%{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_check_and_set_rebuild*.py* +%{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_stop_autorebuild_if_disabled*.py* %endif # with_python3 %changelog +* Mon Oct 19 2015 Tomas Tomecek - 1.6.0-1 +- 1.6.0 release + * Tue Sep 08 2015 Tomas Tomecek - 1.5.1-1 - 1.5.1 release diff --git a/sources b/sources index 5e175a9..89f0723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -908bf92c8126a74ed0c5aa6ad414a40c atomic-reactor-c5137664803035a6cfbe360c75a44ec208270e51.tar.gz +52068c0ee498408e9079747880284609 atomic-reactor-0d0a9bae4e3efecbaa7a38ebc50855d6d6044768.tar.gz