diff --git a/.gitignore b/.gitignore index 475df31..e710c6e 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ /ansible-2.2.0.0.tar.gz /ansible-unittests-2.2.1.0.tar.xz /ansible-2.2.1.0.tar.gz +/ansible-2.2.2.0-0.1.rc1.tar.gz +/ansible-unittests-2.2.2.0.tar.xz diff --git a/ansible-newer-jinja.patch b/ansible-newer-jinja.patch index 3717085..47d61e8 100644 --- a/ansible-newer-jinja.patch +++ b/ansible-newer-jinja.patch @@ -6,7 +6,7 @@ diff -up ansible-2.0.0.2/setup.py.bak ansible-2.0.0.2/setup.py # Ansible will also make use of a system copy of python-six if installed but use a # Bundled copy if it's not. - install_requires=['paramiko', 'jinja2 < 2.9', "PyYAML", 'setuptools', 'pycrypto >= 2.6'], -+ install_requires=['paramiko', 'jinja2 >= 2.6, <2.9', "PyYAML", 'setuptools', 'pycrypto >= 2.6'], ++ install_requires=['paramiko', 'jinja2 >= 2.6, < 2.9', "PyYAML", 'setuptools', 'pycrypto >= 2.6'], package_dir={ '': 'lib' }, packages=find_packages('lib'), package_data={ diff --git a/ansible.spec b/ansible.spec index 8b42b42..2b52c9c 100644 --- a/ansible.spec +++ b/ansible.spec @@ -13,14 +13,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Name: ansible Summary: SSH-based configuration management, deployment, and task execution system -Version: 2.2.1.0 -Release: 2%{?dist} +Version: 2.2.2.0 +Release: 0.1.rc1%{?dist} Group: Development/Libraries License: GPLv3+ -Source0: http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz +Source0: http://releases.ansible.com/ansible/%{name}-%{version}-0.1.rc1.tar.gz # To retrieve the unittests, run: -# ./get-unittests.sh 2.2.1.0 v2.2.1.0-1 +# ./get-unittests.sh 2.2.2.0 v2.2.2.0-1 # Replace the first parameter with the version you want in the tarball name # Replace the second parameter with the git tag or hash that you want to sync with Source1: ansible-unittests-%{version}.tar.xz @@ -174,6 +174,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man1/ansible* %changelog +* Wed Feb 22 2017 Kevin Fenzi - 2.2.2.0-0.1.rc1 +- Update to 2.2.2.0 rc1. Fixes bug #1421485 + * Fri Feb 10 2017 Fedora Release Engineering - 2.2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index ceb9825..e9677d5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ansible-unittests-2.2.1.0.tar.xz) = 8577c0b8b18345cf4c60000119fee1c8cd5a4209a17cc7a616df90cf2eb90f8b6efa70718aa39e87472a72337336471e8ebe1038b35121b3c77a944bc26f5a15 -SHA512 (ansible-2.2.1.0.tar.gz) = 10f90f4ac68215febd14e36fa9ea3b2156677f2b7a29a08633e0702bcbd8a7c3551980deeabcff756380b076ac7ba6a5e9eca07af66d908d8d6627390744bc00 +SHA512 (ansible-2.2.2.0-0.1.rc1.tar.gz) = 6c6f94dac5549dee821a7dd0a961f37521c6ccff30ba057dfedba9a5ee920c2aceb090535925179d8ed7a39cc880e6c6cfe94626981cf5e5bb2a31b4a1ec153e +SHA512 (ansible-unittests-2.2.2.0.tar.xz) = 8eb4f57839f2a835cbf7fb2cbd58058940875cc0bd7681c105cf5f210220a0f8fbfae6004e55e2550c350dcd47daa6f96aca17b495372f128f6d71190271d5e4