Merge branch 'master' into f22

Conflicts: python-cryptography.spec
New upstream release (fix #1267548 )
2015-11-08 23:58:21 +01:00 · 2015-11-08 21:07:36 +01:00 · 2015-08-29 16:55:10 +02:00
1 changed files with 5 additions and 5 deletions
--- a/python-cryptography.spec
+++ b/python-cryptography.spec
@ -5,12 +5,12 @@
 %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif

-%global reqs() %1-idna >= 2.0 %1-pyasn1 %1-six >= 1.4.1 %1-cffi >= 0.8
+%global reqs() %1-idna %1-pyasn1 %1-six >= 1.4.1 %1-cffi >= 0.8
 %global breqs() %1-setuptools %1-pretend %1-iso8601 %1-cryptography-vectors = %{version}

 Name:           python-cryptography
 Version:        1.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PyCA's cryptography library

 Group:          Development/Libraries
@ -106,12 +106,12 @@ popd


 %changelog
+* Sun Nov 08 2015 Matěj Cepl <mcepl@redhat.com> - 1.0.2-3
+- New upstream release (fix #1267548)
+
 * Wed Nov 04 2015 Robert Kuska <rkuska@redhat.com> - 1.0.2-2
 - Rebuilt for Python3.5 rebuild

-* Wed Sep 30 2015 Matěj Cepl <mcepl@redhat.com> - 1.0.2-1
- New upstream release (fix #1267548)
-
 * Wed Aug 12 2015 Nathaniel McCallum <npmccallum@redhat.com> - 1.0-1
 - New upstream release
Author	SHA1	Message	Date
Matěj Cepl	87251326f5	Merge branch 'master' into f22 Conflicts: python-cryptography.spec	2015-11-08 23:58:21 +01:00
Matěj Cepl	32aa2110f2	New upstream release (fix #1267548 )	2015-11-08 21:07:36 +01:00
Haikel Guemar	40bc1b272d	Revert changes: requires updating python-cffi which is not possible now	2015-08-29 16:55:10 +02:00