- updated to 2.0.35

- added include patch (for missing NULL definition)
- updated link patch to change libdat2 dir to just libdir (it must be installed
  before modules defined in the same Makefile)

Changed files:
    dapl-include.patch -> 1.1
    dapl-link.patch -> 1.2
    dapl.spec -> 1.6

diff --git a/dapl-include.patch b/dapl-include.patch
new file mode 100644 (file)
index 0000000..b1e46d6
--- /dev/null
+++ b/dapl-include.patch
@@ -0,0 +1,11 @@
+--- dapl-2.0.35/dat/common/dat_strerror.c.orig 2012-01-13 19:55:59.000000000 +0100
++++ dapl-2.0.35/dat/common/dat_strerror.c      2012-06-04 16:46:08.306764381 +0200
+@@ -43,6 +43,8 @@
+ #include <dat2/udat.h>
+ #endif                                /* __UDAPL__ */
+ 
++#include <stdlib.h>
++
+ /*********************************************************************
+  *                                                                   *
+  * Internal Function Declarations                                    *

diff --git a/dapl-link.patch b/dapl-link.patch
index c8d9f529ce20b63b1e50589ad9eb86a3af02922b..ab4c62f3ff77075f1b177f459b17c1134de13886 100644 (file)
--- a/dapl-link.patch
+++ b/dapl-link.patch
@@ -24,3 +24,22 @@
  endif
  if HAVE_LD_VERSION_SCRIPT
      dat_version_script = -Wl,--version-script=$(srcdir)/dat/udat/libdat2.map
+--- dapl-2.0.35/Makefile.am.orig       2012-06-04 18:20:09.059860993 +0200
++++ dapl-2.0.35/Makefile.am    2012-06-04 18:56:24.686436358 +0200
+@@ -52,7 +52,6 @@
+ 
+ sysconf_DATA = doc/dat.conf
+ 
+-datlibdir = $(libdir)
+ if DEFINE_CMA
+ dapllibofadir = $(libdir)
+ endif
+@@ -63,7 +62,7 @@
+ daplliboucmdir = $(libdir)
+ endif
+ 
+-datlib_LTLIBRARIES = dat/udat/libdat2.la
++lib_LTLIBRARIES = dat/udat/libdat2.la
+ if DEFINE_CMA
+ dapllibofa_LTLIBRARIES = dapl/udapl/libdaplofa.la
+ endif

diff --git a/dapl.spec b/dapl.spec
index 3cd88683f2f6b67795c90ec94248349bb422abd8..41e4e48b14d70b695dc2f9999f655b2dab4b5d25 100644 (file)
--- a/dapl.spec
+++ b/dapl.spec
@@ -1,13 +1,14 @@
 Summary:       Userspace access to RDMA devices using OS-agnostic DAT APIs
 Summary(pl.UTF-8):     Dostęp z przestrzeni użytkownika do urządzeń RDMA poprzez API DAT
 Name:          dapl
-Version:       2.0.34
+Version:       2.0.35
 Release:       1
 License:       CPL v1.0 or BSD or GPL v2
 Group:         Libraries
 Source0:       http://www.openfabrics.org/downloads/dapl/%{name}-%{version}.tar.gz
-# Source0-md5: d8114711c07fa9f4b7e52ab2803a9e8d
+# Source0-md5: ff01d9fbae488e849472d00d6fb14a43
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-include.patch
 URL:           http://www.openfabrics.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
@@ -56,6 +57,7 @@ Ten pakiet zawiera statyczną bibliotekę libdat2.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -69,7 +71,7 @@ Ten pakiet zawiera statyczną bibliotekę libdat2.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 # modules dlopened by soname