--- python-db.spec	2008-06-12 19:56:22.000000000 +0200
+++ python-db.spec.new	2008-07-09 13:23:29.016046000 +0200
@@ -28,8 +28,7 @@
 %define       V_pysqlite_major 2.4
 %define       V_pysqlite       2.4.1
 %define       V_psycopg2       2.0.7
-%define       V_dcoracle2      1.2
-%define       V_mysql_python   1.2.2c1
+%define       V_mysql_python   1.2.2
 %define       V_cx_oracle      4.4
 
 #   package information
@@ -54,9 +53,8 @@
 #   list of sources
 Source0:      http://initd.org/pub/software/pysqlite/releases/%{V_pysqlite_major}/%{V_pysqlite}/pysqlite-%{V_pysqlite}.tar.gz
 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
+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
 Patch0:       python-db.patch
 
 #   build information
@@ -108,11 +106,6 @@
         url       = http://prdownloads.sourceforge.net/mysql-python/
         regex     = MySQL-python-(__VER__)\.tar\.gz
     }
-    prog python-db:dcoracle2 = {
-        version   = %{V_dcoracle2}
-        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/
@@ -124,7 +117,6 @@
     %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
@@ -148,15 +140,6 @@
     ) || exit $?
 %endif
 %if "%{with_oracle}" == "yes"
-    ( cd DCOracle2
-      %{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
-      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;' \
@@ -197,14 +180,6 @@
     ) || exit $?
 %endif
 %if "%{with_oracle}" == "yes"
-    ( cd DCOracle2
-      ORACLE_HOME="`%{l_rc} --query oracle_home`"
-      export ORACLE_HOME
-      %{l_prefix}/bin/python setup.py install \
-          --skip-build \
-          --root=$RPM_BUILD_ROOT \
-          --prefix=%{l_prefix}
-    ) || exit $?
     ( cd cx_Oracle-%{V_cx_oracle}
       ORACLE_HOME="`%{l_rc} --query oracle_home`"
       export ORACLE_HOME