[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 08-Oct-2009 23:18:22
Branch: HEAD Handle: 2009100822182200
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.5 20090930 -> 20091008
Summary:
RevisionChanges Path
1.19+15 -15 openpkg-src/python-db/python-db.patch
1.59+2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.18 -r1.19 python-db.patch
--- openpkg-src/python-db/python-db.patch 11 Aug 2009 17:35:54 -
1.18
+++ openpkg-src/python-db/python-db.patch 8 Oct 2009 21:18:22 -
1.19
@@ -1,9 +1,9 @@
-Index: psycopg2-2.0.12/psycopg/config.h
psycopg2-2.0.12/psycopg/config.h.orig2007-04-11 14:12:37 +0200
-+++ psycopg2-2.0.12/psycopg/config.h 2007-05-17 17:50:16 +0200
-@@ -115,10 +115,11 @@
+Index: psycopg2-2.0.13/psycopg/config.h
+--- psycopg2-2.0.13/psycopg/config.h.orig2009-04-26 14:09:21 +0200
psycopg2-2.0.13/psycopg/config.h 2009-10-08 22:31:01 +0200
+@@ -140,10 +140,11 @@
- #if defined(__FreeBSD__) || (defined(_WIN32) && !defined(__GNUC__)) ||
defined(__sun__)
+ #if (defined(__FreeBSD__) && __FreeBSD_version < 503000) ||
(defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
/* what's this, we have no round function either? */
-static double round(double num)
+static double my_round(double num)
@@ -14,16 +14,16 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
-Index: psycopg2-2.0.12/setup.py
psycopg2-2.0.12/setup.py.orig2007-04-11 17:03:50 +0200
-+++ psycopg2-2.0.12/setup.py 2007-05-17 17:51:26 +0200
-@@ -191,6 +191,9 @@
-
- self.include_dirs.append(".")
- self.libraries.append("pq")
-+self.libraries.append("ssl")
-+self.libraries.append("crypto")
-+self.libraries.append("crypt")
+Index: psycopg2-2.0.13/setup.py
+--- psycopg2-2.0.13/setup.py.orig2009-10-04 23:37:14 +0200
psycopg2-2.0.13/setup.py 2009-10-08 23:15:48 +0200
+@@ -203,6 +203,9 @@
+ os.path.join(self.get_pg_config("libdir"), "libpq.a"))
+ else:
+ self.libraries.append("pq")
++self.libraries.append("ssl")
++self.libraries.append("crypto")
++self.libraries.append("crypt")
try:
self.library_dirs.append(self.get_pg_config("libdir"))
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.58 -r1.59 python-db.spec
--- openpkg-src/python-db/python-db.spec 30 Sep 2009 17:38:10 -
1.58
+++ openpkg-src/python-db/python-db.spec 8 Oct 2009 21:18:22 -
1.59
@@ -27,7 +27,7 @@
%define V_python 2.5
%define V_pysqlite_major 2.4
%define V_pysqlite 2.4.1
-%define V_psycopg2 2.0.12
+%define V_psycopg2 2.0.13
%define V_mysql_python 1.2.3c1
%define V_cx_oracle 5.0.2
%define V_sqlobject 0.11.2
@@ -43,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20090930
+Release: 20091008
# package options
%option with_sqlite yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 11-Aug-2009 19:35:54
Branch: HEAD Handle: 2009081118355400
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.5 20090702 -> 20090811
Summary:
RevisionChanges Path
1.18+6 -6 openpkg-src/python-db/python-db.patch
1.55+2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.17 -r1.18 python-db.patch
--- openpkg-src/python-db/python-db.patch 18 May 2009 20:38:57 -
1.17
+++ openpkg-src/python-db/python-db.patch 11 Aug 2009 17:35:54 -
1.18
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.11/psycopg/config.h
psycopg2-2.0.11/psycopg/config.h.orig2007-04-11 14:12:37 +0200
-+++ psycopg2-2.0.11/psycopg/config.h 2007-05-17 17:50:16 +0200
+Index: psycopg2-2.0.12/psycopg/config.h
+--- psycopg2-2.0.12/psycopg/config.h.orig2007-04-11 14:12:37 +0200
psycopg2-2.0.12/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.11/setup.py
psycopg2-2.0.11/setup.py.orig2007-04-11 17:03:50 +0200
-+++ psycopg2-2.0.11/setup.py 2007-05-17 17:51:26 +0200
+Index: psycopg2-2.0.12/setup.py
+--- psycopg2-2.0.12/setup.py.orig2007-04-11 17:03:50 +0200
psycopg2-2.0.12/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.54 -r1.55 python-db.spec
--- openpkg-src/python-db/python-db.spec 2 Jul 2009 16:44:30 -
1.54
+++ openpkg-src/python-db/python-db.spec 11 Aug 2009 17:35:54 -
1.55
@@ -27,7 +27,7 @@
%define V_python 2.5
%define V_pysqlite_major 2.4
%define V_pysqlite 2.4.1
-%define V_psycopg2 2.0.11
+%define V_psycopg2 2.0.12
%define V_mysql_python 1.2.3c1
%define V_cx_oracle 5.0.2
%define V_sqlobject 0.10.6
@@ -43,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20090702
+Release: 20090811
# package options
%option with_sqlite yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 18-May-2009 22:38:57
Branch: HEAD Handle: 2009051821385700
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.5 20090506 -> 20090518
Summary:
RevisionChanges Path
1.17+6 -6 openpkg-src/python-db/python-db.patch
1.51+2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.16 -r1.17 python-db.patch
--- openpkg-src/python-db/python-db.patch 21 Apr 2009 18:53:10 -
1.16
+++ openpkg-src/python-db/python-db.patch 18 May 2009 20:38:57 -
1.17
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.10/psycopg/config.h
psycopg2-2.0.10/psycopg/config.h.orig2007-04-11 14:12:37 +0200
-+++ psycopg2-2.0.10/psycopg/config.h 2007-05-17 17:50:16 +0200
+Index: psycopg2-2.0.11/psycopg/config.h
+--- psycopg2-2.0.11/psycopg/config.h.orig2007-04-11 14:12:37 +0200
psycopg2-2.0.11/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.10/setup.py
psycopg2-2.0.10/setup.py.orig2007-04-11 17:03:50 +0200
-+++ psycopg2-2.0.10/setup.py 2007-05-17 17:51:26 +0200
+Index: psycopg2-2.0.11/setup.py
+--- psycopg2-2.0.11/setup.py.orig2007-04-11 17:03:50 +0200
psycopg2-2.0.11/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.50 -r1.51 python-db.spec
--- openpkg-src/python-db/python-db.spec 6 May 2009 18:42:56 -
1.50
+++ openpkg-src/python-db/python-db.spec 18 May 2009 20:38:57 -
1.51
@@ -27,7 +27,7 @@
%define V_python 2.5
%define V_pysqlite_major 2.4
%define V_pysqlite 2.4.1
-%define V_psycopg2 2.0.10
+%define V_psycopg2 2.0.11
%define V_mysql_python 1.2.2
%define V_cx_oracle 5.0.1
%define V_sqlobject 0.10.5
@@ -43,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20090506
+Release: 20090518
# package options
%option with_sqlite yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 21-Apr-2009 20:53:10
Branch: HEAD Handle: 2009042119531000
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.5 20090327 -> 20090421
Summary:
RevisionChanges Path
1.16+6 -6 openpkg-src/python-db/python-db.patch
1.49+2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.15 -r1.16 python-db.patch
--- openpkg-src/python-db/python-db.patch 27 Mar 2009 11:45:08 -
1.15
+++ openpkg-src/python-db/python-db.patch 21 Apr 2009 18:53:10 -
1.16
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.9/psycopg/config.h
psycopg2-2.0.9/psycopg/config.h.orig 2007-04-11 14:12:37 +0200
-+++ psycopg2-2.0.9/psycopg/config.h 2007-05-17 17:50:16 +0200
+Index: psycopg2-2.0.10/psycopg/config.h
+--- psycopg2-2.0.10/psycopg/config.h.orig2007-04-11 14:12:37 +0200
psycopg2-2.0.10/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.9/setup.py
psycopg2-2.0.9/setup.py.orig 2007-04-11 17:03:50 +0200
-+++ psycopg2-2.0.9/setup.py 2007-05-17 17:51:26 +0200
+Index: psycopg2-2.0.10/setup.py
+--- psycopg2-2.0.10/setup.py.orig2007-04-11 17:03:50 +0200
psycopg2-2.0.10/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.48 -r1.49 python-db.spec
--- openpkg-src/python-db/python-db.spec 18 Apr 2009 13:14:35 -
1.48
+++ openpkg-src/python-db/python-db.spec 21 Apr 2009 18:53:10 -
1.49
@@ -27,7 +27,7 @@
%define V_python 2.5
%define V_pysqlite_major 2.4
%define V_pysqlite 2.4.1
-%define V_psycopg2 2.0.9
+%define V_psycopg2 2.0.10
%define V_mysql_python 1.2.2
%define V_cx_oracle 5.0.1
%define V_sqlobject 0.10.4
@@ -43,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20090327
+Release: 20090421
# package options
%option with_sqlite yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Mar-2009 12:45:10
Branch: HEAD Handle: 2009032711450800
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.5 20090223 -> 20090327
Summary:
RevisionChanges Path
1.15+6 -6 openpkg-src/python-db/python-db.patch
1.47+2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.14 -r1.15 python-db.patch
--- openpkg-src/python-db/python-db.patch 22 Sep 2008 19:21:40 -
1.14
+++ openpkg-src/python-db/python-db.patch 27 Mar 2009 11:45:08 -
1.15
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.8/psycopg/config.h
psycopg2-2.0.8/psycopg/config.h.orig 2007-04-11 14:12:37 +0200
-+++ psycopg2-2.0.8/psycopg/config.h 2007-05-17 17:50:16 +0200
+Index: psycopg2-2.0.9/psycopg/config.h
+--- psycopg2-2.0.9/psycopg/config.h.orig 2007-04-11 14:12:37 +0200
psycopg2-2.0.9/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.8/setup.py
psycopg2-2.0.8/setup.py.orig 2007-04-11 17:03:50 +0200
-+++ psycopg2-2.0.8/setup.py 2007-05-17 17:51:26 +0200
+Index: psycopg2-2.0.9/setup.py
+--- psycopg2-2.0.9/setup.py.orig 2007-04-11 17:03:50 +0200
psycopg2-2.0.9/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.46 -r1.47 python-db.spec
--- openpkg-src/python-db/python-db.spec 23 Feb 2009 21:51:15 -
1.46
+++ openpkg-src/python-db/python-db.spec 27 Mar 2009 11:45:08 -
1.47
@@ -29,7 +29,7 @@
%define V_pysqlite 2.4.1
%define V_psycopg2 2.0.9
%define V_mysql_python 1.2.2
-%define V_cx_oracle 4.4
+%define V_cx_oracle 5.0.1
%define V_sqlobject 0.10.4
# package information
@@ -43,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20090223
+Release: 20090327
# package options
%option with_sqlite yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Sep-2008 21:21:40
Branch: HEAD Handle: 2008092220214000
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
fix patch and add SQLObject
Summary:
RevisionChanges Path
1.14+6 -6 openpkg-src/python-db/python-db.patch
1.42+18 -1 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.13 -r1.14 python-db.patch
--- openpkg-src/python-db/python-db.patch 7 Jun 2008 08:07:23 -
1.13
+++ openpkg-src/python-db/python-db.patch 22 Sep 2008 19:21:40 -
1.14
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.7/psycopg/config.h
psycopg2-2.0.7/psycopg/config.h.orig 2007-04-11 14:12:37 +0200
-+++ psycopg2-2.0.7/psycopg/config.h 2007-05-17 17:50:16 +0200
+Index: psycopg2-2.0.8/psycopg/config.h
+--- psycopg2-2.0.8/psycopg/config.h.orig 2007-04-11 14:12:37 +0200
psycopg2-2.0.8/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.7/setup.py
psycopg2-2.0.7/setup.py.orig 2007-04-11 17:03:50 +0200
-+++ psycopg2-2.0.7/setup.py 2007-05-17 17:51:26 +0200
+Index: psycopg2-2.0.8/setup.py
+--- psycopg2-2.0.8/setup.py.orig 2007-04-11 17:03:50 +0200
psycopg2-2.0.8/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.41 -r1.42 python-db.spec
--- openpkg-src/python-db/python-db.spec 16 Sep 2008 18:29:14 -
1.41
+++ openpkg-src/python-db/python-db.spec 22 Sep 2008 19:21:40 -
1.42
@@ -30,6 +30,7 @@
%define V_psycopg2 2.0.8
%define V_mysql_python 1.2.2
%define V_cx_oracle 4.4
+%define V_sqlobject 0.10.2
# package information
Name: python-db
@@ -42,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20080916
+Release: 20080922
# package options
%option with_sqlite yes
@@ -55,6 +56,7 @@
Source1:
http://initd.org/pub/software/psycopg/psycopg2-%{V_psycopg2}.tar.gz
Source2:
http://switch.dl.sourceforge.net/mysql-python/MySQL-python-%{V_mysql_python}.tar.gz
Source3:
http://switch.dl.sourceforge.net/cx-oracle/cx_Oracle-%{V_cx_oracle}.tar.gz
+Source4:
http://pypi.python.org/packages/source/S/SQLObject/SQLObject-%{V_sqlobject}.tar.gz
Patch0: python-db.patch
# build information
@@ -111,12 +113,18 @@
url = http://prdownloads.sourceforge.net/cx-oracle/
regex = cx_Oracle-(__VER__)\.tar\.gz
}
+prog python-db:sqlobject = {
+version = %{V_sqlobject}
+url = http://pypi.python.org/pypi/SQLObject
+regex = pypi/SQLObject/(__VER__)
+}
%prep
%setup -q -c
%setup -q -T -D -a 1
%setup -q -T -D -a 2
%setup -q -T -D -a 3
+%setup -q -T -D -a 4
%patch -p0
%build
@@ -149,6 +157,9 @@
%{l_prefix}/bin/python setup.py build
) || exit $?
%endif
+( cd SQLObject-%{V_sqlobject}
+ %{l_prefix}/bin/python setup.py build
+) || exit $?
%install
rm -rf $RPM_BUILD_ROOT
@@ -189,6 +200,12 @@
--prefix=%{l_prefix}
) || exit $?
%endif
+( cd SQLObject-%{V_sqlobject}
+ %{l_prefix}/bin/python setup.py install \
+ --skip-build \
+ --root=$RPM_BUILD_ROOT \
+ --prefix=%{l_prefix}
+) || exit $?
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jun-2008 10:07:26
Branch: HEAD Handle: 2008060709072300
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
fix packaging
Summary:
RevisionChanges Path
1.13+6 -6 openpkg-src/python-db/python-db.patch
1.38+1 -1 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.12 -r1.13 python-db.patch
--- openpkg-src/python-db/python-db.patch 23 Oct 2007 15:51:15 -
1.12
+++ openpkg-src/python-db/python-db.patch 7 Jun 2008 08:07:23 -
1.13
@@ -1,6 +1,6 @@
-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
+Index: psycopg2-2.0.7/psycopg/config.h
+--- psycopg2-2.0.7/psycopg/config.h.orig 2007-04-11 14:12:37 +0200
psycopg2-2.0.7/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.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
+Index: psycopg2-2.0.7/setup.py
+--- psycopg2-2.0.7/setup.py.orig 2007-04-11 17:03:50 +0200
psycopg2-2.0.7/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.37 -r1.38 python-db.spec
--- openpkg-src/python-db/python-db.spec 14 Apr 2008 15:12:05 -
1.37
+++ openpkg-src/python-db/python-db.spec 7 Jun 2008 08:07:23 -
1.38
@@ -43,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20080414
+Release: 20080607
# package options
%option with_sqlite yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
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:
RevisionChanges 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 -
1.11
+++ openpkg-src/python-db/python-db.patch 23 Oct 2007 15:51:15 -
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.h2007-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.py2007-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 -
1.32
+++ openpkg-src/python-db/python-db.spec 23 Oct 2007 15:51:15 -
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
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-May-2007 17:53:20
Branch: HEAD Handle: 2007051716531900
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.5 20070308 -> 20070517
Summary:
RevisionChanges Path
1.11+11 -11 openpkg-src/python-db/python-db.patch
1.27+2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.10 -r1.11 python-db.patch
--- openpkg-src/python-db/python-db.patch 22 Jan 2007 08:33:02 -
1.10
+++ openpkg-src/python-db/python-db.patch 17 May 2007 15:53:19 -
1.11
@@ -1,9 +1,9 @@
-Index: psycopg2-2.0.6b1/psycopg/config.h
psycopg2-2.0.6b1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
-+++ psycopg2-2.0.6b1/psycopg/config.h2006-03-07 21:54:38 +0100
-@@ -104,10 +104,11 @@
+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.h2007-05-17 17:50:16 +0200
+@@ -115,10 +115,11 @@
- #if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
+ #if defined(__FreeBSD__) || (defined(_WIN32) && !defined(__GNUC__)) ||
defined(__sun__)
/* what's this, we have no round function either? */
-static double round(double num)
+static double my_round(double num)
@@ -14,16 +14,16 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
-Index: psycopg2-2.0.6b1/setup.py
psycopg2-2.0.6b1/setup.py.orig 2006-02-11 19:58:38 +0100
-+++ psycopg2-2.0.6b1/setup.py2006-03-07 21:54:38 +0100
-@@ -143,6 +143,9 @@
+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.py2007-05-17 17:51:26 +0200
+@@ -191,6 +191,9 @@
- self.include_dirs.append(".")
+ self.include_dirs.append(".")
self.libraries.append("pq")
+self.libraries.append("ssl")
+self.libraries.append("crypto")
+self.libraries.append("crypt")
-
+
try:
self.library_dirs.append(self.get_pg_config("libdir"))
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.26 -r1.27 python-db.spec
--- openpkg-src/python-db/python-db.spec 8 Mar 2007 16:35:44 -
1.26
+++ openpkg-src/python-db/python-db.spec 17 May 2007 15:53:19 -
1.27
@@ -28,7 +28,7 @@
%define V_python 2.5
%define V_pysqlite_major 2.3
%define V_pysqlite 2.3.3
-%define V_psycopg2 2.0.6b1
+%define V_psycopg2 2.0.6b2
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.2c1
%define V_cx_oracle 4.3
@@ -44,7 +44,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20070308
+Release: 20070517
# package options
%option with_sqlite yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jan-2007 09:33:02
Branch: HEAD Handle: 2007012208330200
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.5 20070114 -> 20070122
Summary:
RevisionChanges Path
1.10+6 -6 openpkg-src/python-db/python-db.patch
1.23+2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.9 -r1.10 python-db.patch
--- openpkg-src/python-db/python-db.patch 3 Sep 2006 13:23:06 -
1.9
+++ openpkg-src/python-db/python-db.patch 22 Jan 2007 08:33:02 -
1.10
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.5.1/psycopg/config.h
psycopg2-2.0.5.1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
-+++ psycopg2-2.0.5.1/psycopg/config.h2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.6b1/psycopg/config.h
+--- psycopg2-2.0.6b1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
psycopg2-2.0.6b1/psycopg/config.h2006-03-07 21:54:38 +0100
@@ -104,10 +104,11 @@
#if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
@@ -14,9 +14,9 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
-Index: psycopg2-2.0.5.1/setup.py
psycopg2-2.0.5.1/setup.py.orig 2006-02-11 19:58:38 +0100
-+++ psycopg2-2.0.5.1/setup.py2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.6b1/setup.py
+--- psycopg2-2.0.6b1/setup.py.orig 2006-02-11 19:58:38 +0100
psycopg2-2.0.6b1/setup.py2006-03-07 21:54:38 +0100
@@ -143,6 +143,9 @@
self.include_dirs.append(".")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.22 -r1.23 python-db.spec
--- openpkg-src/python-db/python-db.spec 14 Jan 2007 09:27:09 -
1.22
+++ openpkg-src/python-db/python-db.spec 22 Jan 2007 08:33:02 -
1.23
@@ -28,7 +28,7 @@
%define V_python 2.5
%define V_pysqlite_major 2.3
%define V_pysqlite 2.3.3
-%define V_psycopg2 2.0.5.1
+%define V_psycopg2 2.0.6b1
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.2b2
%define V_cx_oracle 4.2.1
@@ -44,7 +44,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20070114
+Release: 20070122
# package options
%option with_sqlite yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Sep-2006 15:23:06
Branch: HEAD Handle: 2006090314230600
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.4 20060902 -> 20060903
Summary:
RevisionChanges Path
1.9 +6 -6 openpkg-src/python-db/python-db.patch
1.16+2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.8 -r1.9 python-db.patch
--- openpkg-src/python-db/python-db.patch 2 Sep 2006 09:44:56 -
1.8
+++ openpkg-src/python-db/python-db.patch 3 Sep 2006 13:23:06 -
1.9
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.5/psycopg/config.h
psycopg2-2.0.5/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
-+++ psycopg2-2.0.5/psycopg/config.h 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.5.1/psycopg/config.h
+--- psycopg2-2.0.5.1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
psycopg2-2.0.5.1/psycopg/config.h2006-03-07 21:54:38 +0100
@@ -104,10 +104,11 @@
#if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
@@ -14,9 +14,9 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
-Index: psycopg2-2.0.5/setup.py
psycopg2-2.0.5/setup.py.orig 2006-02-11 19:58:38 +0100
-+++ psycopg2-2.0.5/setup.py 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.5.1/setup.py
+--- psycopg2-2.0.5.1/setup.py.orig 2006-02-11 19:58:38 +0100
psycopg2-2.0.5.1/setup.py2006-03-07 21:54:38 +0100
@@ -143,6 +143,9 @@
self.include_dirs.append(".")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.15 -r1.16 python-db.spec
--- openpkg-src/python-db/python-db.spec 2 Sep 2006 09:44:56 -
1.15
+++ openpkg-src/python-db/python-db.spec 3 Sep 2006 13:23:06 -
1.16
@@ -28,7 +28,7 @@
%define V_python 2.4
%define V_pysqlite_major 2.3
%define V_pysqlite 2.3.2
-%define V_psycopg2 2.0.5
+%define V_psycopg2 2.0.5.1
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.2b1
%define V_cx_oracle 4.2
@@ -44,7 +44,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20060902
+Release: 20060903
# package options
%option with_sqlite yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Sep-2006 11:44:57
Branch: HEAD Handle: 2006090210445600
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.4 20060828 -> 20060902
Summary:
RevisionChanges Path
1.8 +6 -6 openpkg-src/python-db/python-db.patch
1.15+2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.7 -r1.8 python-db.patch
--- openpkg-src/python-db/python-db.patch 6 Aug 2006 08:59:23 -
1.7
+++ openpkg-src/python-db/python-db.patch 2 Sep 2006 09:44:56 -
1.8
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.4/psycopg/config.h
psycopg2-2.0.4/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
-+++ psycopg2-2.0.4/psycopg/config.h 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.5/psycopg/config.h
+--- psycopg2-2.0.5/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
psycopg2-2.0.5/psycopg/config.h 2006-03-07 21:54:38 +0100
@@ -104,10 +104,11 @@
#if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
@@ -14,9 +14,9 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
-Index: psycopg2-2.0.4/setup.py
psycopg2-2.0.4/setup.py.orig 2006-02-11 19:58:38 +0100
-+++ psycopg2-2.0.4/setup.py 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.5/setup.py
+--- psycopg2-2.0.5/setup.py.orig 2006-02-11 19:58:38 +0100
psycopg2-2.0.5/setup.py 2006-03-07 21:54:38 +0100
@@ -143,6 +143,9 @@
self.include_dirs.append(".")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.14 -r1.15 python-db.spec
--- openpkg-src/python-db/python-db.spec 28 Aug 2006 06:57:14 -
1.14
+++ openpkg-src/python-db/python-db.spec 2 Sep 2006 09:44:56 -
1.15
@@ -28,7 +28,7 @@
%define V_python 2.4
%define V_pysqlite_major 2.3
%define V_pysqlite 2.3.2
-%define V_psycopg2 2.0.4
+%define V_psycopg2 2.0.5
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.2b1
%define V_cx_oracle 4.2
@@ -44,7 +44,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20060828
+Release: 20060902
# package options
%option with_sqlite yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Aug-2006 10:59:24
Branch: HEAD Handle: 2006080609592300
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
upgrade PgSQL binding; fix Oracle binding; add a second contributed
Oracle binding (untested)
Summary:
RevisionChanges Path
1.7 +6 -6 openpkg-src/python-db/python-db.patch
1.13+28 -4 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.6 -r1.7 python-db.patch
--- openpkg-src/python-db/python-db.patch 11 Jun 2006 19:59:18 -
1.6
+++ openpkg-src/python-db/python-db.patch 6 Aug 2006 08:59:23 -
1.7
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.2/psycopg/config.h
psycopg2-2.0.2/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
-+++ psycopg2-2.0.2/psycopg/config.h 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.4/psycopg/config.h
+--- psycopg2-2.0.4/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
psycopg2-2.0.4/psycopg/config.h 2006-03-07 21:54:38 +0100
@@ -104,10 +104,11 @@
#if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
@@ -14,9 +14,9 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
-Index: psycopg2-2.0.2/setup.py
psycopg2-2.0.2/setup.py.orig 2006-02-11 19:58:38 +0100
-+++ psycopg2-2.0.2/setup.py 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.4/setup.py
+--- psycopg2-2.0.4/setup.py.orig 2006-02-11 19:58:38 +0100
psycopg2-2.0.4/setup.py 2006-03-07 21:54:38 +0100
@@ -143,6 +143,9 @@
self.include_dirs.append(".")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.12 -r1.13 python-db.spec
--- openpkg-src/python-db/python-db.spec 4 Jul 2006 22:22:08 -
1.12
+++ openpkg-src/python-db/python-db.spec 6 Aug 2006 08:59:23 -
1.13
@@ -28,9 +28,10 @@
%define V_python 2.4
%define V_pysqlite_major 2.3
%define V_pysqlite 2.3.2
-%define V_psycopg2 2.0.2
+%define V_psycopg2 2.0.4
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.1_p2
+%define V_cx_oracle 4.2
# package information
Name: python-db
@@ -43,7 +44,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20060705
+Release: 20060806
# package options
%option with_sqlite yes
@@ -56,6 +57,7 @@
Source1:
http://initd.org/pub/software/psycopg/psycopg2-%{V_psycopg2}.tar.gz
Source2:
http://www.zope.org/Members/matt/dco2/%{V_dcoracle2}/DCOracle2-%{V_dcoracle2}.tgz
Source3:
http://switch.dl.sourceforge.net/mysql-python/MySQL-python-%{V_mysql_python}.tar.gz
+Source4:
http://switch.dl.sourceforge.net/cx-oracle/cx_Oracle-%{V_cx_oracle}.tar.gz
Patch0: python-db.patch
# build information
@@ -112,12 +114,18 @@
url = http://www.zope.org/Members/matt/dco2/
regex = DCOracle2-(\d+\.[\d\.]+)\.tgz
}
+prog python-db:cx_oracle = {
+version = %{V_cx_oracle}
+url = http://prdownloads.sourceforge.net/cx-oracle/
+regex = cx_Oracle-(__VER__)\.tar\.gz
+}
%prep
%setup -q -c
%setup -q -T -D -a 1
%setup -q -T -D -a 2
%setup -q -T -D -a 3
+%setup -q -T -D -a 4
%patch -p0
%build
@@ -141,7 +149,7 @@
) || exit $?
%endif
%if "%{with_oracle}" == "yes"
-( cd DCOracle2-%{V_dcoracle2}
+( cd DCOracle2
%{l_shtool} subst \
-e 's;^\(PYTHON=\).*$;\1 %{l_prefix}/bin/python;' \
Makefile
@@ -150,6 +158,14 @@
%{l_prefix}/bin/python setup.py build
MAKE="%{l_make}" %{l_make} %{l_mflags -O} DCOracle2/dco2.so
) || exit $?
+( cd cx_Oracle-%{V_cx_oracle}
+ %{l_shtool} subst \
+ -e 's;^\(PYTHON=\).*$;\1 %{l_prefix}/bin/python;' \
+ Makefile
+ ORACLE_HOME="`%{l_rc} --query oracle_home`"
+ export ORACLE_HOME
+ %{l_prefix}/bin/python setup.py build
+) || exit $?
%endif
%install
@@ -182,7 +198,15 @@
) || exit $?
%endif
%if "%{with_oracle}" == "yes"
-( cd DCOracle2-
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Jun-2006 21:59:19
Branch: HEAD Handle: 2006061120591800
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.4 20060609 -> 20060611
Summary:
RevisionChanges Path
1.6 +6 -6 openpkg-src/python-db/python-db.patch
1.9 +2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.5 -r1.6 python-db.patch
--- openpkg-src/python-db/python-db.patch 9 Jun 2006 20:27:03 -
1.5
+++ openpkg-src/python-db/python-db.patch 11 Jun 2006 19:59:18 -
1.6
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0.1/psycopg/config.h
psycopg2-2.0.1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
-+++ psycopg2-2.0.1/psycopg/config.h 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.2/psycopg/config.h
+--- psycopg2-2.0.2/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
psycopg2-2.0.2/psycopg/config.h 2006-03-07 21:54:38 +0100
@@ -104,10 +104,11 @@
#if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
@@ -14,9 +14,9 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
-Index: psycopg2-2.0.1/setup.py
psycopg2-2.0.1/setup.py.orig 2006-02-11 19:58:38 +0100
-+++ psycopg2-2.0.1/setup.py 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.2/setup.py
+--- psycopg2-2.0.2/setup.py.orig 2006-02-11 19:58:38 +0100
psycopg2-2.0.2/setup.py 2006-03-07 21:54:38 +0100
@@ -143,6 +143,9 @@
self.include_dirs.append(".")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.8 -r1.9 python-db.spec
--- openpkg-src/python-db/python-db.spec 9 Jun 2006 20:27:03 -
1.8
+++ openpkg-src/python-db/python-db.spec 11 Jun 2006 19:59:18 -
1.9
@@ -28,7 +28,7 @@
%define V_python 2.4
%define V_pysqlite_major 2.2
%define V_pysqlite 2.2.2
-%define V_psycopg2 2.0.1
+%define V_psycopg2 2.0.2
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.1_p2
@@ -43,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20060609
+Release: 20060611
# package options
%option with_sqlite yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Jun-2006 22:27:05
Branch: HEAD Handle: 2006060921270300
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.4 20060524 -> 20060609
Summary:
RevisionChanges Path
1.5 +6 -6 openpkg-src/python-db/python-db.patch
1.8 +2 -2 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.4 -r1.5 python-db.patch
--- openpkg-src/python-db/python-db.patch 5 Apr 2006 06:59:25 -
1.4
+++ openpkg-src/python-db/python-db.patch 9 Jun 2006 20:27:03 -
1.5
@@ -1,6 +1,6 @@
-Index: psycopg2-2.0b8/psycopg/config.h
psycopg2-2.0b8/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
-+++ psycopg2-2.0b8/psycopg/config.h 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.1/psycopg/config.h
+--- psycopg2-2.0.1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
psycopg2-2.0.1/psycopg/config.h 2006-03-07 21:54:38 +0100
@@ -104,10 +104,11 @@
#if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
@@ -14,9 +14,9 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
-Index: psycopg2-2.0b8/setup.py
psycopg2-2.0b8/setup.py.orig 2006-02-11 19:58:38 +0100
-+++ psycopg2-2.0b8/setup.py 2006-03-07 21:54:38 +0100
+Index: psycopg2-2.0.1/setup.py
+--- psycopg2-2.0.1/setup.py.orig 2006-02-11 19:58:38 +0100
psycopg2-2.0.1/setup.py 2006-03-07 21:54:38 +0100
@@ -143,6 +143,9 @@
self.include_dirs.append(".")
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.7 -r1.8 python-db.spec
--- openpkg-src/python-db/python-db.spec 24 May 2006 18:52:55 -
1.7
+++ openpkg-src/python-db/python-db.spec 9 Jun 2006 20:27:03 -
1.8
@@ -28,7 +28,7 @@
%define V_python 2.4
%define V_pysqlite_major 2.2
%define V_pysqlite 2.2.2
-%define V_psycopg2 2.0b8
+%define V_psycopg2 2.0.1
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.1_p2
@@ -43,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20060524
+Release: 20060609
# package options
%option with_sqlite yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Apr-2006 08:59:25
Branch: HEAD Handle: 2006040507592500
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
modifying package: python-db-2.4 20060328 -> 20060405
Summary:
RevisionChanges Path
1.4 +0 -28 openpkg-src/python-db/python-db.patch
1.4 +3 -3 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.3 -r1.4 python-db.patch
--- openpkg-src/python-db/python-db.patch 7 Mar 2006 20:57:25 -
1.3
+++ openpkg-src/python-db/python-db.patch 5 Apr 2006 06:59:25 -
1.4
@@ -27,31 +27,3 @@
try:
self.library_dirs.append(self.get_pg_config("libdir"))
-Index: pysqlite-2.1.3/setup.py
pysqlite-2.1.3/setup.py.orig 2006-02-02 01:15:04 +0100
-+++ pysqlite-2.1.3/setup.py 2006-03-07 21:55:19 +0100
-@@ -23,10 +23,11 @@
-
- import glob, os, sys
-
--from ez_setup import use_setuptools
--use_setuptools()
-+#from ez_setup import use_setuptools
-+#use_setuptools()
-
--from setuptools import setup, Extension, Command
-+#from setuptools import setup, Extension, Command
-+from distutils.core import setup, Extension, Command
-
- # If you need to change anything, it should be enough to change setup.cfg.
-
-@@ -115,9 +116,7 @@
- platforms = "ALL",
- url = "http://pysqlite.org/";,
- download_url =
"http://initd.org/tracker/pysqlite/wiki/PysqliteDownloads";,
--test_suite = "pysqlite2.test.suite",
- cmdclass = {"build_docs": DocBuilder},
--extras_require = {"build_docs": ["docutils", "SilverCity"]},
-
- # Description of the modules and packages in the distribution
- package_dir = {"pysqlite2": "pysqlite2"},
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.3 -r1.4 python-db.spec
--- openpkg-src/python-db/python-db.spec 28 Mar 2006 19:21:57 -
1.3
+++ openpkg-src/python-db/python-db.spec 5 Apr 2006 06:59:25 -
1.4
@@ -26,8 +26,8 @@
# package version
%define V_python 2.4
-%define V_pysqlite_major 2.1
-%define V_pysqlite 2.1.3
+%define V_pysqlite_major 2.2
+%define V_pysqlite 2.2.0
%define V_psycopg2 2.0b8
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.1c8
@@ -43,7 +43,7 @@
Group:Language
License: GPL
Version: %{V_python}
-Release: 20060328
+Release: 20060405
# package options
%option with_sqlite yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/python-db/ python-db.patch python-db.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Mar-2006 21:57:25
Branch: HEAD Handle: 2006030720572500
Modified files:
openpkg-src/python-db python-db.patch python-db.spec
Log:
fix SQLite module building by removing nasty setuptools stuff
Summary:
RevisionChanges Path
1.3 +31 -2 openpkg-src/python-db/python-db.patch
1.2 +2 -5 openpkg-src/python-db/python-db.spec
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.patch
$ cvs diff -u -r1.2 -r1.3 python-db.patch
--- openpkg-src/python-db/python-db.patch 7 Mar 2006 20:06:55 -
1.2
+++ openpkg-src/python-db/python-db.patch 7 Mar 2006 20:57:25 -
1.3
@@ -1,6 +1,6 @@
Index: psycopg2-2.0b8/psycopg/config.h
--- psycopg2-2.0b8/psycopg/config.h.orig 2006-02-11 19:56:19 +0100
-+++ psycopg2-2.0b8/psycopg/config.h 2006-03-07 17:39:30 +0100
psycopg2-2.0b8/psycopg/config.h 2006-03-07 21:54:38 +0100
@@ -104,10 +104,11 @@
#if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
@@ -14,8 +14,9 @@
#endif
/* postgresql < 7.4 does not have PQfreemem */
+Index: psycopg2-2.0b8/setup.py
--- psycopg2-2.0b8/setup.py.orig 2006-02-11 19:58:38 +0100
-+++ psycopg2-2.0b8/setup.py 2006-03-07 17:44:25 +0100
psycopg2-2.0b8/setup.py 2006-03-07 21:54:38 +0100
@@ -143,6 +143,9 @@
self.include_dirs.append(".")
@@ -26,3 +27,31 @@
try:
self.library_dirs.append(self.get_pg_config("libdir"))
+Index: pysqlite-2.1.3/setup.py
+--- pysqlite-2.1.3/setup.py.orig 2006-02-02 01:15:04 +0100
pysqlite-2.1.3/setup.py 2006-03-07 21:55:19 +0100
+@@ -23,10 +23,11 @@
+
+ import glob, os, sys
+
+-from ez_setup import use_setuptools
+-use_setuptools()
++#from ez_setup import use_setuptools
++#use_setuptools()
+
+-from setuptools import setup, Extension, Command
++#from setuptools import setup, Extension, Command
++from distutils.core import setup, Extension, Command
+
+ # If you need to change anything, it should be enough to change setup.cfg.
+
+@@ -115,9 +116,7 @@
+ platforms = "ALL",
+ url = "http://pysqlite.org/";,
+ download_url =
"http://initd.org/tracker/pysqlite/wiki/PysqliteDownloads";,
+-test_suite = "pysqlite2.test.suite",
+ cmdclass = {"build_docs": DocBuilder},
+-extras_require = {"build_docs": ["docutils", "SilverCity"]},
+
+ # Description of the modules and packages in the distribution
+ package_dir = {"pysqlite2": "pysqlite2"},
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python-db/python-db.spec
$ cvs diff -u -r1.1 -r1.2 python-db.spec
--- openpkg-src/python-db/python-db.spec 7 Mar 2006 17:34:01 -
1.1
+++ openpkg-src/python-db/python-db.spec 7 Mar 2006 20:57:25 -
1.2
@@ -22,7 +22,6 @@
## SUCH DAMAGE.
##
-# FIXME: rse: SQLite module still has some install problems
# FIXME: rse: Oracle module was blindly packaged
# package version
@@ -30,7 +29,6 @@
%define V_pysqlite_major 2.1
%define V_pysqlite 2.1.3
%define V_psycopg2 2.0b8
-%define V_setuptools 0.6a9
%define V_dcoracle2 1.2
%define V_mysql_python 1.2.1c7
@@ -48,7 +46,7 @@
Release: 20060307
# package options
-%option with_sqlite no
+%option with_sqlite yes
%option with_pgsql no
%option with_mysql no
%option with_oracle no
@@ -58,7 +56,6 @@
Source1:
http://initd.org/pub/software/psycopg/psycopg2-%{V_psycopg2}.tar.gz
Source2:
http://www.zope.org/Members/matt/dco2/%{V_dcoracle2}/DCOracle2-%{V_dcoracle2}.tgz
Source3:
http://osdn.dl.sourceforge.net/mysql-python/MySQL-python-%{V_mysql_python}.tar.gz
-Source4:
http://cheeseshop.python.org/packages/%{V_python}/s/setuptools/setuptools-%{V_setuptools}-py%{V_python}.egg
Patch0: python-db.patch
# build information
@@ -126,7 +123,6 @@
%build
%if "%{with_sqlite}" == "yes"
( cd pysqlite-%{V_pysqlite}
- cp %{SOURCE setuptools-%{V_setuptools}-py%{V_python}.egg} .
%{l_shtool} subst \
-e 's;/usr/local/include;%{l_prefix}/include;'
