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:
Revision Changes 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 -0000
1.13
+++ openpkg-src/python-db/python-db.patch 22 Sep 2008 19:21:40 -0000
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 -0000
1.41
+++ openpkg-src/python-db/python-db.spec 22 Sep 2008 19:21:40 -0000
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
