tzdata: Update to 2014j

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

diff --git a/python/python.nm b/python/python.nm
index 34582210e6f2ebcb7a3ed227b5b72f13944b8649..52adcebdeae88b3cf056f20232193ec73d0b85f9 100644 (file)
--- a/python/python.nm
+++ b/python/python.nm
@@ -5,8 +5,8 @@
 
 name       = python
 major_ver  = 2.7
-version    = %{major_ver}.2
-release    = 3
+version    = %{major_ver}.5
+release    = 1
 thisapp    = Python-%{version}
 
 groups     = Development/Languages
@@ -30,67 +30,77 @@ build
                autoconf
                automake
                bzip2-devel
-               db4-devel
                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
-               sed -e "s/#*shared*/*shared*/g" -i Modules/Setup.dist
-
                # 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
 
+       configure_options += \
+               --enable-ipv6 \
+               --enable-unicode=ucs4 \
+               --with-system-expat \
+               --with-system-ffi \
+               --enable-shared
+
        build
                export CPPFLAGS=$(pkg-config --cflags-only-I libffi)
 
                OPT="%{CFLAGS}" \
                        ./configure \
-                               --prefix=/usr \
-                               --enable-ipv6 \
-                               --enable-unicode=ucs4 \
-                               --with-system-expat \
-                               --with-system-ffi \
-                               --enable-shared
+                               %{configure_options}
 
                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}/usr/lib/python*/ -name "*.py" | xargs chmod a-x -v
+               find %{BUILDROOT}%{libdir}/python*/ -name "*.py" | xargs -r chmod a-x -v
 
                # Create symlink for shared lib.
-               ln -svf ../../libpython%{major_ver}.so %{BUILDROOT}/usr/lib/python%{major_ver}/config/
+               ln -svf ../../libpython%{major_ver}.so %{BUILDROOT}%{libdir}/python%{major_ver}/config/
        end
 end
 
 packages
        package %{name}
+               # Define python-abi manually.
+               provides
+                       python-abi = %{major_ver}
+               end
+       end
 
        package %{name}-devel
                template DEVEL
 
                files += \
-                       !/usr/lib/python*/config/Makefile \
-                       !/usr/include/python*/pyconfig.h
+                       !%{libdir}/python*/config/Makefile \
+                       !%{includedir}/python*/pyconfig.h
        end
 
        package %{name}-debuginfo