[pyOpenSSL] - Merge-review cleanup by Parag Nemade (#226335) - New upstream release

[Tomáš Mráz]

commit 42ea8f0360ce95b7ac0dd136c48e175f40967e02
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon Oct 4 15:06:13 2010 +0200

    - Merge-review cleanup by Parag Nemade (#226335)
    - New upstream release

 .gitignore                  |    1 +
 pyOpenSSL-0.7-openssl.patch |   13 ---
 pyOpenSSL-threadsafe.patch  |  197 -------------------------------------------
 pyOpenSSL.spec              |   34 ++++----
 sources                     |    2 +-
 5 files changed, 20 insertions(+), 227 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3a60f48..03d4011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pyOpenSSL-0.9.tar.gz
+/pyOpenSSL-0.10.tar.gz
diff --git a/pyOpenSSL.spec b/pyOpenSSL.spec
index aaeed98..1beab81 100644
--- a/pyOpenSSL.spec
+++ b/pyOpenSSL.spec
@@ -1,50 +1,48 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
-Version: 0.9
-Release: 2%{?dist}
-Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
-Patch0: pyOpenSSL-0.7-openssl.patch
+Version: 0.10
+Release: 1%{?dist}
+Source0: http://pypi.python.org/packages/source/p/pyOpenSSL/%{name}-%{version}.tar.gz
+
+# Fedora specific patches
+
 Patch2: pyOpenSSL-elinks.patch
 Patch3: pyOpenSSL-nopdfout.patch
-# Hopefully the following patch is unnecessary now
-#Patch4: pyOpenSSL-threadsafe.patch
 License: LGPLv2+
 Group: Development/Libraries
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Url: http://pyopenssl.sourceforge.net/
 BuildRequires: elinks openssl-devel python-devel
 BuildRequires: tetex-dvips tetex-latex latex2html
 
+# we don't want to provide private python extension libs
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/.*\.so$ 
+%filter_setup
+}
+
 %description
-High-level wrapper around a subset of the OpenSSL library, includes
+High-level wrapper around a subset of the OpenSSL library, includes among others
  * SSL.Connection objects, wrapping the methods of Python's portable
    sockets
  * Callbacks written in Python
  * Extensive error-handling mechanism, mirroring OpenSSL's error codes
-...  and much more ;)
 
 %prep
 %setup -q
-%patch0 -p1 -b .posixIncludes
 %patch2 -p1 -b .elinks
 %patch3 -p1 -b .nopdfout
 # Fix permissions for debuginfo package
 %{__chmod} -x src/ssl/connection.c
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="%{optflags} -fno-strict-aliasing" %{__python} setup.py build
 %{__make} -C doc ps
 %{__make} -C doc text html
 find doc/ -name pyOpenSSL.\*
 
 %install
-%{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-%clean
-%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -53,6 +51,10 @@ find doc/ -name pyOpenSSL.\*
 %{python_sitearch}/%{name}*.egg-info
 
 %changelog
+* Mon Oct  4 2010 Tomas Mraz <tmraz at redhat.com> - 0.10-1
+- Merge-review cleanup by Parag Nemade (#226335)
+- New upstream release
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index abc49e4..0e2f1fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bf282b2d6a03af921920c34079580f2  pyOpenSSL-0.9.tar.gz
+34db8056ec53ce80c7f5fc58bee9f093  pyOpenSSL-0.10.tar.gz