mcepl pushed to python-cryptography (f20). "Revert back to origin/el6 state. (..more)"

[notifications at fedoraproject.org]

>From c0cf9659a5f67a3817794e0f918bbe4058727259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl at cepl.eu>
Date: Tue, 14 Apr 2015 18:46:04 +0200
Subject: Revert back to origin/el6 state.

We are missing modern libraries in f20.

diff --git a/.gitignore b/.gitignore
index d8920bd..7c16ad3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
 /cryptography-0.6.1.tar.gz
-/cryptography-0.7.2.tar.gz
-/cryptography-0.8.tar.gz
diff --git a/python-cryptography.spec b/python-cryptography.spec
index bf759bf..dca88da 100644
--- a/python-cryptography.spec
+++ b/python-cryptography.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} > 20
+%if 0%{?fedora} > 12
 %global with_python3 1
 %else
 %{!?__python2: %global __python2 /usr/bin/python2}
@@ -6,45 +6,28 @@
 %endif
 
 Name:           python-cryptography
-Version:        0.8
+Version:        0.6.1
 Release:        2%{?dist}
 Summary:        PyCA's cryptography library
 
 Group:          Development/Libraries
-License:        ASL 2.0 or BSD
+License:        ASL 2.0
 URL:            https://cryptography.io/en/latest/
 Source0:        https://pypi.python.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz
 
 BuildRequires:  openssl-devel
-BuildRequires:  python-enum34
-
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
-BuildRequires:  python-cffi >= 0.8
-BuildRequires:  python-six
-BuildRequires:  python-cryptography-vectors = %{version}
-BuildRequires:  python-pyasn1
-BuildRequires:  python-iso8601
-BuildRequires:  python-pretend
-BuildRequires:  pytest
-
+BuildRequires:  python2-devel python-setuptools python-cffi >= 0.8 python-six
+# For check
+BuildRequires:  python-cryptography-vectors, pytest, python-pyasn1
+BuildRequires:  python-iso8601, python-pretend
 %if 0%{?with_python3}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-cffi >= 0.8
-BuildRequires:  python3-six
-BuildRequires:  python3-cryptography-vectors = %{version}
-BuildRequires:  python3-pyasn1
-BuildRequires:  python3-iso8601
-BuildRequires:  python3-pretend
-BuildRequires:  python3-pytest
+BuildRequires:  python3-devel python3-setuptools python3-cffi >= 0.8 python3-six
+BuildRequires:  python3-pytest, python3-pyasn1, python3-iso8601, python3-pretend
 %endif
 
 Requires:       openssl
-Requires:       python-enum34
 Requires:       python-cffi >= 0.8
 Requires:       python-six >= 1.6.1
-Requires:       python-pyasn1
 
 %description
 cryptography is a package designed to expose cryptographic primitives and
@@ -98,46 +81,28 @@ popd
 
 
 %check
-%if 0%{?fedora} > 20
 %{__python} setup.py test
 
 %if 0%{?with_python3}
 pushd %{py3dir}
-%{__python3} setup.py test
+%{__python3} setup.py install --skip-build --prefix=%{_prefix} --root %{buildroot}
 popd
 %endif
-%endif
 
 
 %files
-%doc LICENSE LICENSE.APACHE LICENSE.BSD README.rst docs
+%doc LICENSE README.rst docs
 %{python_sitearch}/*
 
 
 %if 0%{?with_python3}
 %files -n python3-cryptography
-%doc LICENSE LICENSE.APACHE LICENSE.BSD README.rst docs
+%doc LICENSE README.rst docs
 %{python3_sitearch}/*
 %endif
 
 
 %changelog
-* Tue Apr 14 2015 Matej Cepl <mcepl at redhat.com> - 0.8-2
-- Add python-pyasn1 Requires (#1211073)
-
-* Fri Mar 13 2015 Nathaniel McCallum <nathaniel at natemccallum.com> - 0.8-1
-- New upstream release
-- Remove upstreamed patch
-
-* Wed Mar 04 2015 Nathaniel McCallum <npmccallum at redhat.com> - 0.7.2-2
-- Add python3-cryptography-vectors build requires
-- Add python-enum34 requires
-
-* Tue Feb 03 2015 Nathaniel McCallum <npmccallum at redhat.com> - 0.7.2-1
-- New upstream release. BSD is now an optional license.
-- Fix test running on python3
-- Add upstream patch to fix test paths
-
 * Fri Nov 07 2014 Matej Cepl <mcepl at redhat.com> - 0.6.1-2
 - Fix requires, for reasons why other development files were not
   eliminated see https://github.com/pyca/cryptography/issues/1463.
diff --git a/sources b/sources
index 05c1bbc..3fab4cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0871039903e8b554179fd2b30a6647d  cryptography-0.8.tar.gz
+1c48fd78742d85c9cffdcceb6809e45b  cryptography-0.6.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-cryptography.git/commit/?h=f20&id=c0cf9659a5f67a3817794e0f918bbe4058727259