rpms/m2crypto/devel .cvsignore, 1.4, 1.5 m2crypto.spec, 1.14, 1.15 sources, 1.4, 1.5 0.13p1.patch, 1.1, NONE m2crypto-0.13-python24.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: mitr

Update of /cvs/dist/rpms/m2crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3389

Modified Files:
	.cvsignore m2crypto.spec sources 
Removed Files:
	0.13p1.patch m2crypto-0.13-python24.patch 
Log Message:
* Mon Aug 29 2005 Miloslav Trmac <mitr at redhat.com> - 0.15-1
- Update to m2crypto-0.15
- Drop bundled swig



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Nov 2004 12:51:20 -0000	1.4
+++ .cvsignore	29 Aug 2005 00:57:58 -0000	1.5
@@ -1,2 +1 @@
-m2crypto-0.13.zip
-swig-1.3.23.tar.gz
+m2crypto-0.15.tar.bz2


Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- m2crypto.spec	14 Jun 2005 12:01:59 -0000	1.14
+++ m2crypto.spec	29 Aug 2005 00:57:58 -0000	1.15
@@ -1,37 +1,27 @@
 %{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
-%define pymainver %{nil}
-%define swigver 1.3.23
 
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
-Version: 0.13
-Release: 5
-Source0: http://sandbox.rulemaker.net/ngps/Dist/m2crypto-%{version}.zip
-Source1: http://unc.dl.sourceforge.net/sourceforge/swig/swig-%{swigver}.tar.gz
-Patch0: http://sandbox.rulemaker.net/ngps/Dist/0.13p1.patch
-Patch1: m2crypto-0.13-python24.patch
-Patch2: m2crypto-0.13-SSLServer.patch
+Version: 0.15
+Release: 1
+# http://svn.osafoundation.org/m2crypto/tags/0.15
+Source0: m2crypto-%{version}.tar.bz2
+Patch0: m2crypto-0.13-SSLServer.patch
 License: BSDish
 Group: System Environment/Libraries
 URL: http://sandbox.rulemaker.net/ngps/m2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPreReq: openssl-devel, python%{pymainver}-devel >= %{pythonver}
-BuildPreReq: perl, pkgconfig, unzip
-Requires: python%{pymainver}
+BuildRequires: openssl-devel, python-devel >= %{pythonver}
+BuildRequires: perl, pkgconfig, unzip
+Requires: python
 Obsoletes: openssl-python
 
 %description
 This package allows you to call OpenSSL functions from python scripts.
 
 %prep
-%setup -q -a 1
-
-# Create a directory to hold the local SWIG binary.
-mkdir swigroot
-
-%patch0 -p0 -b .pl1
-%patch1 -p1 -b .py24
-%patch2 -p0 -b .SSLServer
+%setup -q 
+%patch0 -p0 -b .SSLServer
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
@@ -40,24 +30,6 @@
 	LDFLAGS="$LDFLAGS`pkg-config --libs-only-L openssl`" ; export LDFLAGS
 fi
 
-swigroot=`pwd`/swigroot
-pushd SWIG-%{swigver}
-./configure \
-	--prefix=${swigroot} \
-	--disable-shared \
-	--enable-static \
-	--without-guile \
-	--without-java \
-	--without-ocaml \
-	--without-perl5 \
-	--without-php4 \
-	--without-pike \
-	--without-tcl
-make
-make install
-popd
-
-PATH=${swigroot}/bin${PATH:+:${PATH}} ; export PATH
 python%{pythonver} setup.py build
 
 %install
@@ -76,10 +48,14 @@
 
 %files
 %defattr(-,root,root)
-%doc BUGS CHANGES LIC* README README.Developers demo tests
+%doc BUGS CHANGES LIC* README README.Developers demo demo2004 tests
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Mon Aug 29 2005 Miloslav Trmac <mitr at redhat.com> - 0.15-1
+- Update to m2crypto-0.15
+- Drop bundled swig
+
 * Tue Jun 14 2005 Miloslav Trmac <mitr at redhat.com> - 0.13-5
 - Better fix for #159898, by Dan Williams
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Nov 2004 12:47:42 -0000	1.4
+++ sources	29 Aug 2005 00:57:58 -0000	1.5
@@ -1,2 +1 @@
-be2790a34349ab452dddbcfe4c95606a  m2crypto-0.13.zip
-3f12460b7d0cbb96ea7bf66f86fcea5b  swig-1.3.23.tar.gz
+befaf54d86eaf13f7591d630f28a10ee  m2crypto-0.15.tar.bz2


--- 0.13p1.patch DELETED ---


--- m2crypto-0.13-python24.patch DELETED ---