Author: jsteffan Update of /cvs/free/rpms/compat-python24/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv12741/F-13 Modified Files: .cvsignore compat-python-2.4.5-db47.patch compat-python24.spec sources Added Files: compat-python-2.4-config-db48.patch compat-python-2.4-db48.patch Removed Files: compat-python-2.4.4-db46.patch Log Message: Update to python 2.4.6 w/db4 4.8 support. compat-python-2.4-config-db48.patch: Setup.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE compat-python-2.4-config-db48.patch --- diff -up Python-2.4.6/Modules/Setup.dist.orig Python-2.4.6/Modules/Setup.dist --- Python-2.4.6/Modules/Setup.dist.orig 2010-03-20 17:13:42.304650556 -0600 +++ Python-2.4.6/Modules/Setup.dist 2010-03-20 17:13:48.316900339 -0600 @@ -398,7 +398,7 @@ gdbm gdbmmodule.c -I/usr/local/include - # # Edit the variables DB and DBLIBVERto point to the db top directory # and the subdirectory of PORT where you built it. -DBLIBVER=4.7 +DBLIBVER=4.8 DBINC=/usr/include/db4 DBLIB=/usr/lib _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) compat-python-2.4-db48.patch: _bsddb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- NEW FILE compat-python-2.4-db48.patch --- diff -up Python-2.4.6/Modules/_bsddb.c.orig Python-2.4.6/Modules/_bsddb.c --- Python-2.4.6/Modules/_bsddb.c.orig 2010-03-20 16:47:14.718678928 -0600 +++ Python-2.4.6/Modules/_bsddb.c 2010-03-20 16:48:10.013649515 -0600 @@ -4317,9 +4317,9 @@ DBTxn_prepare(DBTxnObject* self, PyObjec if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size)) return NULL; - if (gid_size != DB_XIDDATASIZE) { + if (gid_size != DB_GID_SIZE) { PyErr_SetString(PyExc_TypeError, - "gid must be DB_XIDDATASIZE bytes long"); + "gid must be DB_GID_SIZE bytes long"); return NULL; } @@ -4892,7 +4892,6 @@ DL_EXPORT(void) init_bsddb(void) /* allow apps to be written using DB_RPCCLIENT on older BerkeleyDB */ _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT); #endif - ADD_INT(d, DB_XA_CREATE); ADD_INT(d, DB_CREATE); ADD_INT(d, DB_NOMMAP); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/compat-python24/F-13/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Aug 2008 20:39:35 -0000 1.2 +++ .cvsignore 20 Mar 2010 23:53:22 -0000 1.3 @@ -1,2 +1,2 @@ JapaneseCodecs-1.4.11.tar.gz -Python-2.4.5.tar.bz2 +Python-2.4.6.tar.bz2 compat-python-2.4.5-db47.patch: Modules/_bsddb.c | 27 +++++++++++++++++++++++++-- setup.py | 4 ++-- 2 files changed, 27 insertions(+), 4 deletions(-) Index: compat-python-2.4.5-db47.patch =================================================================== RCS file: /cvs/free/rpms/compat-python24/F-13/compat-python-2.4.5-db47.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- compat-python-2.4.5-db47.patch 27 Sep 2008 20:30:21 -0000 1.1 +++ compat-python-2.4.5-db47.patch 20 Mar 2010 23:53:22 -0000 1.2 @@ -101,7 +101,7 @@ # http://www.sleepycat.com/update/index.html - max_db_ver = (4, 4) -+ max_db_ver = (4, 7) ++ max_db_ver = (4, 8) min_db_ver = (3, 2) db_setup_debug = False # verbose debug prints from this script? @@ -110,7 +110,7 @@ ] # 4.x minor number specific paths - for x in (0,1,2,3,4): -+ for x in (0,1,2,3,4,5,6,7): ++ for x in (0,1,2,3,4,5,6,7,8): db_inc_paths.append('/usr/include/db4%d' % x) db_inc_paths.append('/usr/include/db4.%d' % x) db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) Index: compat-python24.spec =================================================================== RCS file: /cvs/free/rpms/compat-python24/F-13/compat-python24.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- compat-python24.spec 10 Oct 2009 09:26:16 -0000 1.9 +++ compat-python24.spec 20 Mar 2010 23:53:22 -0000 1.10 @@ -12,8 +12,8 @@ Summary: An interpreted, interactive, object-oriented programming language Name: compat-python24 -Version: %{pybasever}.5 -Release: 7%{?dist} +Version: %{pybasever}.6 +Release: 1%{?dist} License: Python Software Foundation License v2 Group: Development/Languages Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 @@ -34,7 +34,8 @@ Patch18: compat-python-2.4.3-cflags.patch Patch19: compat-python-2.4.3-locale.patch Patch20: compat-python-2.4.5-db47.patch -#Patch21: compat-python-2.4.4-db4-debug.patch +Patch21: compat-python-2.4-db48.patch +Patch22: compat-python-2.4-config-db48.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, libtermcap-devel, openssl-devel, gmp-devel @@ -43,7 +44,13 @@ BuildRequires: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel BuildRequires: tix-devel bzip2-devel BuildRequires: autoconf +# Make sure db4 4.8 is used if fedora >= 13 +%if 0%{?fedora} >= 13 +BuildRequires: db4-devel >= 4.8 +%else BuildRequires: db4-devel >= 4.3 +%endif + URL: http://www.python.org/ Provides: python-abi = 2.4, python(abi) = 2.4 @@ -125,7 +132,12 @@ %patch18 -p1 -b .cflags %patch19 -p2 -b .locale %patch20 -p1 -b .db4 -#%%patch21 -p1 -b .db-debug +# Conditionally patch for db4 4.8 +%if 0%{?fedora} >= 13 +%patch21 -p1 -b .db48 +%patch22 -p1 -b .db48 +%endif + # This shouldn't be necesarry, but is right now (2.2a3) find -name "*~" |xargs rm -f @@ -370,6 +382,10 @@ %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so %changelog +* Sat Mar 20 2010 Jonathan Steffan <jonathansteffan a gmail.com> - 2.4.6-1 +- Update to 2.4.6 +- Add a patch for bdb 4.8 + * Sat Oct 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.4.5-7 - rebuilt Index: sources =================================================================== RCS file: /cvs/free/rpms/compat-python24/F-13/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Aug 2008 20:39:35 -0000 1.2 +++ sources 20 Mar 2010 23:53:22 -0000 1.3 @@ -1,2 +1,2 @@ e4f2ed866f4ce978fb54bb962eab4fdf JapaneseCodecs-1.4.11.tar.gz -aade3958cb097cc1c69ae0074297d359 Python-2.4.5.tar.bz2 +76083277f6c7e4d78992f36d7ad9018d Python-2.4.6.tar.bz2 --- compat-python-2.4.4-db46.patch DELETED ---