tzdata: Update to 2014j

[people/ms/ipfire-3.x.git] / python / python.nm

diff --git a/python/python.nm b/python/python.nm
index d5c1a2d7b12e956cf75179c3d8cb981a0c564aba..52adcebdeae88b3cf056f20232193ec73d0b85f9 100644 (file)
--- a/python/python.nm
+++ b/python/python.nm
@@ -5,7 +5,7 @@
 
 name       = python
 major_ver  = 2.7
-version    = %{major_ver}.3
+version    = %{major_ver}.5
 release    = 1
 thisapp    = Python-%{version}
 
@@ -30,34 +30,30 @@ build
                autoconf
                automake
                bzip2-devel
-               db4-devel >= 1:4.8
                expat-devel
+               gdbm-devel
+               glibc-headers >= 2.16-4
+               libdb-devel
                libffi-devel
                libselinux-devel
                ncurses-devel
                openssl-devel
-               pkg-config
+               pakfire-builder >= 0.9.23-4
                readline-devel
                sqlite-devel
                tar
+               util-linux
                zlib-devel
        end
 
        export CFLAGS  += -D_GNU_SOURCE -fwrapv
 
        prepare_cmds
-               # Apply patches for x86_64.
-               if [ "$(uname -m)" = "x86_64" ]; then
-                       patch -Np1 -i %{DIR_SOURCE}/python-2.7.3-lib64.patch
-                       patch -Np1 -i %{DIR_SOURCE}/python-2.7-lib64-sysconfig.patch
-               fi
-
                # Remove embedded copies of expat, zlib and libffi
                rm -rf Modules/{expat,zlib}
                rm -rf Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
 
-               # Remove autoconf version check and reconfigure
-               sed -e "s/^version_required.*//" -i configure.in
+               # Reconfigure
                autoreconf --force
        end
 
@@ -78,6 +74,10 @@ build
                make %{PARALLELISMFLAGS}
        end
 
+       test
+               WITHIN_PYTHON_RPM_BUILD= EXTRATESTOPTS="--verbose" make test || :
+       end
+
        install_cmds
                # All *.py files don't need to be executeable...
                find %{BUILDROOT}%{libdir}/python*/ -name "*.py" | xargs -r chmod a-x -v