Merge remote-tracking branch 'ummeegge/libssh2-update'

diff --git a/dos2unix/dos2unix.nm b/dos2unix/dos2unix.nm
index 55da32154e7a8f836108aaf26950b4b9e9a07a78..1fde0d0c27d1a8c2d7f1d4275190b9924a547d1b 100644 (file)
--- a/dos2unix/dos2unix.nm
+++ b/dos2unix/dos2unix.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = dos2unix
-version    = 5.1.1
+version    = 6.0.2
 release    = 1
 
 groups     = Applications/Text
@@ -13,11 +13,11 @@ license    = BSD
 summary    = Text file format converters.
 
 description
-       Convert text files with DOS or Mac line endings to Unix line endings and \
+       Convert text files with DOS or Mac line endings to Unix line endings and
        vice versa.
 end
 
-source_dl  =
+source_dl  = http://waterlan.home.xs4all.nl/dos2unix/
 
 build
        requires

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 8a12d01f7c1137bc7c9160f4f53e15f19e4ecfa0..23ac9c7fde08c6faef0431992ce9b906a65dc9f4 100644 (file)
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -5,7 +5,7 @@
 
 name       = glibc
 version    = 2.16.0
-release    = 3
+release    = 4
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Base
@@ -155,7 +155,8 @@ build
                --with-selinux \
                --disable-werror \
                --enable-bind-now \
-               --enable-nss-crypt
+               --enable-nss-crypt \
+               --enable-obsolete-rpc
 
        if "%{DISTRO_ARCH}" == "armv5tel"
                # Disable hardware FP for ARM.

diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm
index aac269c3397c93261a73e9141c8eaa749ff3a4be..2f9b5fb7e75ea9fdbad744e070a53e517c1c3dd3 100644 (file)
--- a/hdparm/hdparm.nm
+++ b/hdparm/hdparm.nm
@@ -22,7 +22,7 @@ source_dl  = http://sourceforge.net/projects/%{name}/files/%{name}/
 
 build
        build
-               CFLAGS="%{CFLAGS}" make %{PARALELLIAMFLAGS} \
+               CFLAGS="%{CFLAGS}" make %{PARALLELISMFLAGS} \
                        STRIP=/bin/true LDFLAGS=
        end
 

diff --git a/mdadm/mdadm.nm b/mdadm/mdadm.nm
index a166010a84a7411d1815c088833650eb8d51ce4c..159034c7530ae11413cfc64e1697b37804021e4b 100644 (file)
--- a/mdadm/mdadm.nm
+++ b/mdadm/mdadm.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = mdadm
-version    = 3.2.2
-release    = 2
+version    = 3.2.6
+release    = 1
 
 groups     = System/Base
 url        = http://www.kernel.org/pub/linux/utils/raid/mdadm/
@@ -20,7 +20,8 @@ description
        file can be used to help with some common tasks.
 end
 
-source_dl  =
+source_dl  = https://www.kernel.org/pub/linux/utils/raid/mdadm/
+sources           = %{thisapp}.tar.xz
 
 build
        requires

diff --git a/python/python-2.7-lib64-sysconfig.patch b/python/patches/x86_64/python-2.7-lib64-sysconfig.patch
similarity index 100%
rename from python/python-2.7-lib64-sysconfig.patch
rename to python/patches/x86_64/python-2.7-lib64-sysconfig.patch

diff --git a/python/python-2.7.3-lib64.patch b/python/patches/x86_64/python-2.7.3-lib64.patch
similarity index 100%
rename from python/python-2.7.3-lib64.patch
rename to python/patches/x86_64/python-2.7.3-lib64.patch

diff --git a/python/python.nm b/python/python.nm
index d5c1a2d7b12e956cf75179c3d8cb981a0c564aba..8aff9240d2af133b3df06f4b500499a603529336 100644 (file)
--- a/python/python.nm
+++ b/python/python.nm
@@ -6,7 +6,7 @@
 name       = python
 major_ver  = 2.7
 version    = %{major_ver}.3
-release    = 1
+release    = 2
 thisapp    = Python-%{version}
 
 groups     = Development/Languages
@@ -32,11 +32,12 @@ build
                bzip2-devel
                db4-devel >= 1:4.8
                expat-devel
+               glibc-headers >= 2.16-4
                libffi-devel
                libselinux-devel
                ncurses-devel
                openssl-devel
-               pkg-config
+               pakfire-builder >= 0.9.23-4
                readline-devel
                sqlite-devel
                tar
@@ -46,12 +47,6 @@ build
        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}