SPECS (AC-branch): python-M2Crypto.spec - merge from HEAD - adapte...

psz psz at pld-linux.org
Sun Dec 3 04:29:20 CET 2006


Author: psz                          Date: Sun Dec  3 03:29:20 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge from HEAD
- adapted for python 2.4

---- Files affected:
SPECS:
   python-M2Crypto.spec (1.27 -> 1.27.2.1) 

---- Diffs:

================================================================
Index: SPECS/python-M2Crypto.spec
diff -u SPECS/python-M2Crypto.spec:1.27 SPECS/python-M2Crypto.spec:1.27.2.1
--- SPECS/python-M2Crypto.spec:1.27	Mon Dec 27 17:38:29 2004
+++ SPECS/python-M2Crypto.spec	Sun Dec  3 04:29:14 2006
@@ -1,24 +1,22 @@
 # $Revision$, $Date$
-
+# NOTE: doesn't work properly (at least TLS in cjc) when built with recent swig
 Summary:	Python interface to OpenSSL
 Summary(pl):	Interfejs Pythona do OpenSSL
 Name:		python-M2Crypto
-Version:	0.13
-Release:	4
+Version:	0.16
+Release:	2
 License:	BSD-like
-Source0:	http://sandbox.rulemaker.net/ngps/Dist/m2crypto-%{version}.zip
-# Source0-md5:	be2790a34349ab452dddbcfe4c95606a
-#		http://sandbox.rulemaker.net/ngps/Dist/0.13p1.patch
-Patch0:		%{name}-0.13p1.patch
-Patch1:		%{name}-swig_sources.patch
-URL:		http://sandbox.rulemaker.net/ngps/m2/
 Group:		Development/Languages/Python
-%pyrequires_eq	python
-BuildRequires:	python-devel >= 2.2.1
+Source0:	http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
+# Source0-md5:	6fc06583a2be56fc2a46872a0540d78e
+Patch0:		%{name}-swig_sources.patch
+URL:		http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
 BuildRequires:	openssl-devel >= 0.9.7d
-BuildRequires:	swig >= 1.3.17
-BuildRequires:	rpm-pythonprov
+BuildRequires:	python-devel >= 1:2.4
+BuildRequires:	swig >= 1.3.24
+BuildRequires:	swig-python >= 1.3.24
 BuildRequires:	unzip
+%pyrequires_eq	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,11 +36,12 @@
 
 %prep
 %setup -q -n m2crypto-%{version}
-%patch0 -p0
-%patch1 -p1
+%patch0 -p1
+
+find demo -type d -name CVS | xargs rm -rf
 
 %build
-python setup.py build 
+python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,15 +52,16 @@
 	--optimize=2
 
 # shutup check-files
-find $RPM_BUILD_ROOT/%{py_sitedir} -name \*.py \
+find $RPM_BUILD_ROOT%{py_sitedir} -name \*.py \
 	-exec rm {} \;
-	
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS CHANGES INSTALL LICENCE README doc/*.html demo
+%doc CHANGES LICENCE README doc/*.html demo
+%dir %{py_sitedir}/M2Crypto
 %attr(755,root,root) %{py_sitedir}/M2Crypto/*.so
 %{py_sitedir}/M2Crypto/*.py[oc]
 %dir %{py_sitedir}/M2Crypto/SSL
@@ -75,6 +75,46 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27.2.1  2006/12/03 03:29:14  psz
+- merge from HEAD
+- adapted for python 2.4
+
+Revision 1.38  2006/11/18 20:57:42  qboosh
+- package .egg-info for python 2.5
+
+Revision 1.37  2006/11/16 20:43:51  qboosh
+- unified; TLS in cjc still doesn't work
+
+Revision 1.36  2006/10/05 19:22:47  qboosh
+- removed INSTALL from doc (useless in binary package)
+
+Revision 1.35  2006/09/27 20:26:39  wrobell
+- rel. 2
+
+Revision 1.34  2006/09/27 20:14:31  wrobell
+- merged from DEVEL (ver. 0.16, rel. 1)
+
+Revision 1.33.2.1  2006/08/11 17:09:05  wrobell
+- ver. 0.16
+
+Revision 1.33  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
+Revision 1.32  2006/02/21 23:42:24  qboosh
+- swig >= 1.3.24 creates broken package - fix needed
+
+Revision 1.31  2006/02/21 23:19:15  qboosh
+- don't package CVS dirs with demos
+
+Revision 1.30  2006/02/21 23:16:34  qboosh
+- missing dir, release 5
+
+Revision 1.29  2005/06/27 00:15:20  saq
+- as of 1.3.25, swig subpackages actually contain something useful
+
+Revision 1.28  2005/03/12 12:32:37  troll
+- mass commit: remove obsolete BR: rpm-pythonprov
+
 Revision 1.27  2004/12/27 16:38:29  saq
 - swig_sources.patch for modern method signature
 - release 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/python-M2Crypto.spec?r1=1.27&r2=1.27.2.1&f=u



More information about the pld-cvs-commit mailing list