1.1 --- a/python-db/python-db.spec Tue Mar 22 19:33:14 2011 +0100 1.2 +++ b/python-db/python-db.spec Tue Mar 22 19:46:20 2011 +0100 1.3 @@ -21,16 +21,14 @@ 1.4 ## SUCH DAMAGE. 1.5 ## 1.6 1.7 -# FIXME: rse: Oracle module was blindly packaged 1.8 - 1.9 # package version 1.10 -%define V_python 2.5 1.11 -%define V_pysqlite_major 2.4 1.12 -%define V_pysqlite 2.4.1 1.13 -%define V_psycopg2 2.0.14 1.14 -%define V_mysql_python 1.2.3c1 1.15 -%define V_cx_oracle 5.0.3 1.16 -%define V_sqlobject 0.12.4 1.17 +%define V_python 2.7 1.18 +%define V_pysqlite 2.6.3 1.19 +%define V_psycopg2 2.4 1.20 +%define V_psycopg_maj 2-4 1.21 +%define V_mysql_python 1.2.3 1.22 +%define V_cx_oracle 5.1 1.23 +%define V_sqlobject 0.15.1 1.24 1.25 # package information 1.26 Name: python-db 1.27 @@ -43,7 +41,7 @@ 1.28 Group: Language 1.29 License: GPL 1.30 Version: %{V_python} 1.31 -Release: 20100506 1.32 +Release: 20110322 1.33 1.34 # package options 1.35 %option with_sqlite yes 1.36 @@ -52,16 +50,18 @@ 1.37 %option with_oracle no 1.38 1.39 # list of sources 1.40 -Source0: http://initd.org/pub/software/pysqlite/releases/%{V_pysqlite_major}/%{V_pysqlite}/pysqlite-%{V_pysqlite}.tar.gz 1.41 -Source1: http://initd.org/pub/software/psycopg/psycopg2-%{V_psycopg2}.tar.gz 1.42 +Source0: http://pysqlite.googlecode.com/files/pysqlite-%{V_pysqlite}.tar.gz 1.43 +Source1: http://www.psycopg.org/psycopg/tarballs/PSYCOPG-%{V_psycopg_maj}/psycopg2-%{V_psycopg2}.tar.gz 1.44 Source2: http://switch.dl.sourceforge.net/mysql-python/MySQL-python-%{V_mysql_python}.tar.gz 1.45 Source3: http://switch.dl.sourceforge.net/cx-oracle/cx_Oracle-%{V_cx_oracle}.tar.gz 1.46 Source4: http://pypi.python.org/packages/source/S/SQLObject/SQLObject-%{V_sqlobject}.tar.gz 1.47 Patch0: python-db.patch 1.48 1.49 # build information 1.50 -BuildPreReq: OpenPKG, openpkg >= 20100101, python >= %{V_python} 1.51 -PreReq: OpenPKG, openpkg >= 20100101, python >= %{V_python} 1.52 +Prefix: %{l_prefix} 1.53 +BuildRoot: %{l_buildroot} 1.54 +BuildPreReq: OpenPKG, openpkg >= 20060823, python >= %{V_python} 1.55 +PreReq: OpenPKG, openpkg >= 20060823, python >= %{V_python} 1.56 BuildPreReq: python-setup 1.57 %if "%{with_sqlite}" == "yes" 1.58 BuildPreReq: sqlite 1.59 @@ -79,6 +79,8 @@ 1.60 BuildPreReq: oracle 1.61 PreReq: oracle 1.62 %endif 1.63 +AutoReq: no 1.64 +AutoReqProv: no 1.65 1.66 %description 1.67 This packages provides Python DB-API 2.0 compliant bindings to 1.68 @@ -159,6 +161,7 @@ 1.69 ) || exit $? 1.70 1.71 %install 1.72 + rm -rf $RPM_BUILD_ROOT 1.73 %{l_shtool} mkdir -f -p -m 755 \ 1.74 $RPM_BUILD_ROOT%{l_prefix} 1.75 %if "%{with_sqlite}" == "yes" 1.76 @@ -207,4 +210,5 @@ 1.77 %files -f files 1.78 1.79 %clean 1.80 + rm -rf $RPM_BUILD_ROOT 1.81