[libmlx4] Update to latest upstream sources Fix broken modprobe.conf file

[Doug Ledford]

commit 5746f8da1b286f70160592828e33ae5d13fc0ed3
Author: Doug Ledford <dledford at redhat.com>
Date:   Wed Jul 20 14:21:24 2011 -0400

    Update to latest upstream sources
    Fix broken modprobe.conf file
    
    Signed-off-by: Doug Ledford <dledford at redhat.com>

 .gitignore            |    1 +
 libmlx4-modprobe.conf |    2 +-
 libmlx4.spec          |   24 +++++++++---------------
 sources               |    2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38ceae5..8533d5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libmlx4-1.0.tar.gz
 libmlx4-1.0.1.tar.gz
+libmlx4-1.0.2.tar.gz
diff --git a/libmlx4-modprobe.conf b/libmlx4-modprobe.conf
index ad648b7..6af4b87 100644
--- a/libmlx4-modprobe.conf
+++ b/libmlx4-modprobe.conf
@@ -1 +1 @@
-install mlx4_core /sbin/modprobe --ignore-install mlx4_core && if [ -f /etc/ofed/setup-mlx4.awk -a -f /etc/ofed/mlx4.conf ]; then awk -f /etc/ofed/setup-mlx4.awk /etc/ofed/mlx4.conf /sbin/setup-mlx4; fi; /sbin/modprobe mlx4_en; /sbin/modprobe mlx4_ib
+install mlx4_core /sbin/modprobe --ignore-install mlx4_core && if [ -f /etc/rdma/setup-mlx4.awk -a -f /etc/rdma/mlx4.conf ]; then awk -f /etc/rdma/setup-mlx4.awk /etc/rdma/mlx4.conf /sbin/setup-mlx4; fi; /sbin/modprobe mlx4_en; /sbin/modprobe mlx4_ib
diff --git a/libmlx4.spec b/libmlx4.spec
index 700819c..29cfccf 100644
--- a/libmlx4.spec
+++ b/libmlx4.spec
@@ -1,8 +1,8 @@
 Name: libmlx4
-Version: 1.0.1
-Release: 8%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
-Provides: libibverbs-driver
+Provides: libibverbs-driver.%{_arch}
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openib.org/
@@ -10,15 +10,10 @@ Source: http://openib.org/downloads/mlx4/%{name}-%{version}.tar.gz
 Source1: libmlx4-modprobe.conf
 Source2: libmlx4-mlx4.conf
 Source3: libmlx4-setup-mlx4.awk
-Patch0: libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch
-Patch1: libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
-Patch2: libmlx4-0003-mmap-needs-some-includes.patch
-Patch3: libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch
-Patch4: libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides: libmlx4-devel = %{version}-%{release}
 Obsoletes: %{name}-devel < 1.0.1-2
-BuildRequires: libibverbs-devel >= 1.1.3
+BuildRequires: libibverbs-devel > 1.1.4
 %ifnarch ia64 %{sparc} %{arm}
 BuildRequires: valgrind-devel
 %endif
@@ -41,11 +36,6 @@ application, which may be useful for debugging.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %ifnarch ia64 %{sparc} %{arm}
@@ -81,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmlx4.a
 
 %changelog
+* Wed Jul 20 2011 Doug Ledford <dledford at redhat.com> - 1.0.2-1
+- Update to latest version
+- Fix modprobe.conf to look in /etc/rdma instead of /etc/ofed
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -91,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 - sparc arches dont have valgrind disable its support on them
 
 * Thu Feb 11 2010 Doug Ledford <dledford at redhat.com> - 1.0.1-5
-- Minor cleanups to Obsoletest to resolve some repo issues
+- Minor cleanups to Obsoletes to resolve some repo issues
 
 * Mon Jan 11 2010 Doug Ledford <dledford at redhat.com> - 1.0.1-4
 - Don't try to build on s390(x) as the hardware doesn't exist there
diff --git a/sources b/sources
index 7b5ac63..63011d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-044d9b1ff3b92f0331a3ee48779423ef  libmlx4-1.0.1.tar.gz
+32c83ffb8ab3c78405b18f129655f707  libmlx4-1.0.2.tar.gz