Jeremy Katz wrote:
On Wed, 2006-12-06 at 16:17 -0500, Jeremy Katz wrote:
If anyone runs into any problems or has any questions, let me know. And
if you need a python25 package to play with while on FC6, my slightly
older packages are still available at
http://people.redhat.com/~katzj/python/fc6/. The changes from that
build are largely clean-ups and shouldn't impact any basic porting
effort.
Jeremy
[1] A few packages failed to rebuild for reasons unrelated to the new
version of python and I didn't dig into all of them to fix.
One of these packages is pyOpenSSL; attached patch fixes build on
Rawhide and does some general cleanups.
Cheers, Paul.
Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/dist/rpms/pyOpenSSL/devel/pyOpenSSL.spec,v
retrieving revision 1.23
diff -u -r1.23 pyOpenSSL.spec
--- pyOpenSSL.spec 7 Dec 2006 16:07:01 -0000 1.23
+++ pyOpenSSL.spec 11 Dec 2006 18:25:49 -0000
@@ -1,7 +1,9 @@
+%{!?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.6
-Release: 1.p24.8
+Release: 1.p24.9%{?dist}
Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
Patch0: pyOpenSSL-0.5.1-openssl097.patch
Patch2: pyOpenSSL-elinks.patch
@@ -10,10 +12,9 @@
License: LGPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
-Prefix: %{_prefix}
Url: http://pyopenssl.sourceforge.net/
-Requires: python
-BuildRequires: elinks openssl-devel python-devel perl tetex-dvips tetex-latex
+BuildRequires: elinks openssl-devel python-devel
+BuildRequires: tetex-dvips tetex-latex latex2html
%description
High-level wrapper around a subset of the OpenSSL library, includes
@@ -29,29 +30,37 @@
%patch2 -p1 -b .elinks
%patch3 -p1 -b .nopdfout
%patch4 -p1 -b .threadsafe
+# Fix permissions for debuginfo package
+%{__chmod} -x src/ssl/connection.c
%build
-python setup.py build
-make -C doc ps
-make -C doc text html
+CFLAGS="%{optflags}" %{__python} setup.py build
+%{__make} -C doc ps
+%{__make} -C doc text html
%install
-python setup.py install \
---root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
-sed -e 's|/[^/]*$||' INSTALLED_FILES | grep "site-packages/" | \
- sort | uniq | awk '{ print "%attr(755,root,root) %dir " $1}' > INSTALLED_DIRS
-cat INSTALLED_FILES INSTALLED_DIRS > INSTALLED_OBJECTS
+%{__rm} -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
-%files -f INSTALLED_OBJECTS
-%{_libdir}/python2.4/site-packages/OpenSSL/*.pyo
-%defattr(-,root,root)
+%files
+%defattr(-,root,root,-)
%doc README doc/pyOpenSSL.ps
%doc doc/pyOpenSSL.txt doc/html
+%{python_sitearch}/OpenSSL/
%changelog
+* Mon Dec 11 2006 Paul Howarth <paul@xxxxxxxxxxxx> - 0.6-1.p24.9
+- add missing buildreq latex2html, needed to build HTML docs
+- rewrite to be more in line with Fedora python spec template and use
+ %%{python_sitearch} rather than a script-generated %%files list
+- package is not relocatable - drop Prefix: tag
+- buildreq perl not necessary
+- fix permissions for files going into debuginfo package
+- add dist tag
+
* Thu Dec 7 2006 Jeremy Katz <katzj@xxxxxxxxxx> - 0.6-1.p24.8
- rebuild for python 2.5
--
Fedora-maintainers mailing list
Fedora-maintainers@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-maintainers
--
Fedora-maintainers-readonly mailing list
Fedora-maintainers-readonly@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-maintainers-readonly
