- seems like we can achieve the same with --with-dbmliborder

Changed files:
    python3-no_ndbm.patch -> 1.3
    python3.spec -> 1.21

diff --git a/python3-no_ndbm.patch b/python3-no_ndbm.patch
deleted file mode 100644 (file)
index c25e990..0000000
--- a/python3-no_ndbm.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- Python-3.0.1/setup.py.wiget        2009-02-21 20:21:34.000000000 +0100
-+++ Python-3.0.1/setup.py      2009-02-21 20:25:49.000000000 +0100
-@@ -776,39 +776,9 @@ class PyBuildExt(build_ext):
- 
-         # The standard Unix dbm module:
-         if platform not in ['cygwin']:
--            if find_file("ndbm.h", inc_dirs, []) is not None:
--                # Some systems have -lndbm, others don't
--                if self.compiler.find_library_file(lib_dirs, 'ndbm'):
--                    ndbm_libs = ['ndbm']
--                else:
--                    ndbm_libs = []
--                exts.append( Extension('_dbm', ['_dbmmodule.c'],
--                                       define_macros=[('HAVE_NDBM_H',None)],
--                                       libraries = ndbm_libs ) )
--            elif self.compiler.find_library_file(lib_dirs, 'gdbm'):
--                gdbm_libs = ['gdbm']
--                if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
--                    gdbm_libs.append('gdbm_compat')
--                if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
--                    exts.append( Extension(
--                        '_dbm', ['_dbmmodule.c'],
--                        define_macros=[('HAVE_GDBM_NDBM_H',None)],
--                        libraries = gdbm_libs ) )
--                elif find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
--                    exts.append( Extension(
--                        '_dbm', ['_dbmmodule.c'],
--                        define_macros=[('HAVE_GDBM_DASH_NDBM_H',None)],
--                        libraries = gdbm_libs ) )
--            elif db_incs is not None:
--                exts.append( Extension('_dbm', ['_dbmmodule.c'],
--                                       library_dirs=dblib_dir,
--                                       runtime_library_dirs=dblib_dir,
--                                       include_dirs=db_incs,
--                                       define_macros=[('HAVE_BERKDB_H',None),
--                                                      ('DB_DBM_HSEARCH',None)],
--                                       libraries=dblibs))
--            else:
--                missing.append('_dbm')
-+            exts.append( Extension('_dbm', ['_dbmmodule.c'],
-+                                   define_macros=[('HAVE_NDBM_H',None)],
-+                                   libraries = ["gdbm", "gdbm_compat"] ) )
- 
-         # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-         if (self.compiler.find_library_file(lib_dirs, 'gdbm')):

diff --git a/python3.spec b/python3.spec
index 02c4981ac5ea17915605ba9f5bbb00f0bd1dcfbd..97786c51a5112de70b0ea05842babb42c1ee0f46 100644 (file)
--- a/python3.spec
+++ b/python3.spec
@@ -42,7 +42,6 @@ Group:                Applications
 Source0:       http://www.python.org/ftp/python/%{version}/Python-%{version}%{beta}.tar.bz2
 # Source0-md5: f64437a24d39f1917aa1878cc70621f6
 Patch1:                %{name}-pythonpath.patch
-Patch2:                %{name}-no_ndbm.patch
 Patch3:                %{name}-ac_fixes.patch
 Patch4:                %{name}-lib64.patch
 Patch5:                %{name}-noarch_to_datadir.patch
@@ -495,7 +494,6 @@ Przykłady te są dla Pythona 2.3.4, nie %{version}.
 %prep
 %setup -q -n Python-%{version}%{beta}
 %patch1 -p1
-#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1