diff --git a/.gitignore b/.gitignore index b0d32ee..4f42435 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /atomic-reactor-1.4.0.tar.gz +/atomic-reactor-c5137664803035a6cfbe360c75a44ec208270e51.tar.gz diff --git a/atomic-reactor.spec b/atomic-reactor.spec index 8b63ce8..4623586 100644 --- a/atomic-reactor.spec +++ b/atomic-reactor.spec @@ -14,17 +14,20 @@ %global owner projectatomic %global project atomic-reactor +%global commit c5137664803035a6cfbe360c75a44ec208270e51 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + %global dock_obsolete_vr 1.3.7-2 Name: %{project} -Version: 1.4.0 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: Improved builder for Docker images Group: Development/Tools License: BSD URL: https://github.com/%{owner}/%{project} -Source0: https://pypi.python.org/packages/source/a/atomic-reactor/%{project}-%{version}.tar.gz +Source0: https://github.com/%{owner}/%{project}/archive/%{commit}/%{project}-%{commit}.tar.gz BuildArch: noarch @@ -88,9 +91,12 @@ License: BSD Requires: python-docker-py Requires: python-requests Requires: python-setuptools -Requires: python-dockerfile-parse +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} @@ -108,9 +114,11 @@ License: BSD Requires: python3-docker-py Requires: python3-requests Requires: python3-setuptools -Requires: python3-dockerfile-parse +Requires: python3-dockerfile-parse >= 0.0.4 # 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} @@ -146,7 +154,7 @@ Plugin for submitting metadata to OSBS %prep -%setup -qn %{name}-%{version} +%setup -qn %{name}-%{commit} %build @@ -198,7 +206,7 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/ %{python2_sitelib}/atomic_reactor/cli %{python2_sitelib}/atomic_reactor/plugins %exclude %{python2_sitelib}/atomic_reactor/plugins/pre_koji.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/post_store_metadata_in_osv3.py* +%exclude %{python2_sitelib}/atomic_reactor/plugins/exit_store_metadata_in_osv3.py* %{python2_sitelib}/atomic_reactor-%{version}-py2.*.egg-info %dir %{_datadir}/%{name} %{_datadir}/%{name}/atomic-reactor.tar.gz @@ -210,7 +218,7 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/ %files -n python-atomic-reactor-metadata -%{python2_sitelib}/atomic_reactor/plugins/post_store_metadata_in_osv3.py* +%{python2_sitelib}/atomic_reactor/plugins/exit_store_metadata_in_osv3.py* %if 0%{?with_python3} @@ -230,7 +238,7 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/ %{python3_sitelib}/atomic_reactor/__pycache__/*.py* %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__/post_store_metadata_in_osv3*.py* +%exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/exit_store_metadata_in_osv3*.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 @@ -247,12 +255,18 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/ %files -n python3-atomic-reactor-metadata -%{python3_sitelib}/atomic_reactor/plugins/post_store_metadata_in_osv3.py* -%{python3_sitelib}/atomic_reactor/plugins/__pycache__/post_store_metadata_in_osv3*.py* +%{python3_sitelib}/atomic_reactor/plugins/exit_store_metadata_in_osv3.py* +%{python3_sitelib}/atomic_reactor/plugins/__pycache__/exit_store_metadata_in_osv3*.py* %endif # with_python3 %changelog +* Tue Sep 08 2015 Tomas Tomecek - 1.5.1-1 +- 1.5.1 release + +* Fri Sep 04 2015 Tomas Tomecek - 1.5.0-1 +- 1.5.0 release + * Tue Jul 28 2015 bkabrda - 1.4.0-2 - fix issues found during Fedora re-review (rhbz#1246702) diff --git a/sources b/sources index 1271b56..5e175a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fbac20ac49527323b4db4c3afcfc75d atomic-reactor-1.4.0.tar.gz +908bf92c8126a74ed0c5aa6ad414a40c atomic-reactor-c5137664803035a6cfbe360c75a44ec208270e51.tar.gz