OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Oct-2007 17:51:16
Branch: HEAD Handle: 2007102316511500
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
unbreak build of pysqlite; upgrade of psycopg2
Summary:
Revision Changes Path
1.12 +6 -6 openpkg-src/python-db/python-db.patch
1.33 +5 -5 openpkg-src/python-db/python-db.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 python-db.patch
--- openpkg-src/python-db/python-db.patch 17 May 2007 15:53:19 -0000
1.11
+++ openpkg-src/python-db/python-db.patch 23 Oct 2007 15:51:15 -0000
1.12
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.6b2/psycopg/config.h
---- psycopg2-2.0.6b2/psycopg/config.h.orig 2007-04-11 14:12:37 +0200
-+++ psycopg2-2.0.6b2/psycopg/config.h 2007-05-17 17:50:16 +0200
+Index: psycopg2-2.0.6/psycopg/config.h
+--- psycopg2-2.0.6/psycopg/config.h.orig 2007-04-11 14:12:37 +0200
++++ psycopg2-2.0.6/psycopg/config.h 2007-05-17 17:50:16 +0200
@@ -115,10 +115,11 @@
#if defined(__FreeBSD__) || (defined(_WIN32) && !defined(__GNUC__)) ||
defined(__sun__)
@@ -14,9 +14,9 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
-Index: psycopg2-2.0.6b2/setup.py
---- psycopg2-2.0.6b2/setup.py.orig 2007-04-11 17:03:50 +0200
-+++ psycopg2-2.0.6b2/setup.py 2007-05-17 17:51:26 +0200
+Index: psycopg2-2.0.6/setup.py
+--- psycopg2-2.0.6/setup.py.orig 2007-04-11 17:03:50 +0200
++++ psycopg2-2.0.6/setup.py 2007-05-17 17:51:26 +0200
@@ -191,6 +191,9 @@
self.include_dirs.append(".")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 python-db.spec
--- openpkg-src/python-db/python-db.spec 3 Oct 2007 07:43:31 -0000
1.32
+++ openpkg-src/python-db/python-db.spec 23 Oct 2007 15:51:15 -0000
1.33
@@ -28,7 +28,7 @@
%define V_python 2.5
%define V_pysqlite_major 2.3
%define V_pysqlite 2.3.5
-%define V_psycopg2 2.0.6b2
+%define V_psycopg2 2.0.6
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.2c1
%define V_cx_oracle 4.3.3
@@ -44,7 +44,7 @@
Group: Language
License: GPL
Version: %{V_python}
-Release: 20071003
+Release: 20071023
# package options
%option with_sqlite yes
@@ -132,9 +132,9 @@
%if "%{with_sqlite}" == "yes"
( cd pysqlite-%{V_pysqlite}
%{l_shtool} subst \
- -e 's;/usr/include;%{l_prefix}/include;' \
- -e 's;/usr/lib;%{l_prefix}/lib;' \
- setup.cfg
+ -e 's;^\([ »··]*include_dirs =
\[\)\([^\]]*\).*$;\1"%{l_prefix}/include"\2;' \
+ -e 's;^\([ »··]*library_dirs =
\[\)\([^\]]*\).*$;\1"%{l_prefix}/lib"\2;' \
+ setup.py
%{l_prefix}/bin/python setup.py build
) || exit $?
%endif
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
