rpms/pygpgme/FC-6 pygpgme-0.1-py23.patch, NONE, 1.1 pygpgme.spec, 1.1, 1.2

Toshio Ernie Kuratomi (toshio) fedora-extras-commits at redhat.com
Tue Oct 24 22:46:30 UTC 2006


Author: toshio

Update of /cvs/extras/rpms/pygpgme/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24622

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-0.1-py23.patch 
Log Message:
- Add a patch to work under Python 2.3.
- Stop shipping the tests as they are useless to the end user.


pygpgme-0.1-py23.patch:

--- NEW FILE pygpgme-0.1-py23.patch ---
--- pygpgme-0.1/src/pygpgme.h.py23	2006-10-13 09:21:33.000000000 -0700
+++ pygpgme-0.1/src/pygpgme.h	2006-10-13 09:22:41.000000000 -0700
@@ -23,6 +23,11 @@
 #include <Python.h>
 #include <gpgme.h>
 
+/* For python 2.3 compatibility */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
 #define HIDDEN __attribute__((visibility("hidden")))
 
 typedef struct {


Index: pygpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/pygpgme/FC-6/pygpgme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygpgme.spec	16 Oct 2006 18:30:02 -0000	1.1
+++ pygpgme.spec	24 Oct 2006 22:46:00 -0000	1.2
@@ -2,13 +2,14 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
 Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0:         pygpgme-0.1-py23.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -21,6 +22,9 @@
 %prep
 %setup -q
 
+# Patch necessary for python version 2.3 and below.
+%patch0 -p1 -b .py23
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -29,6 +33,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +46,10 @@
 %{python_sitearch}/gpgme/
 
 %changelog
+* Mon Oct 23 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-3
+- Add a patch to work under Python 2.3.
+- Stop shipping the tests as they are useless to the end user.
+
 * Fri Oct 13 2006 Toshio Kuratomi <toshio at tiki-lounge.com> - 0.1-2
 - Change URL to cheeseshop
 




More information about the scm-commits mailing list