From 16ebd5d68533beb52ea82ef6256f51a3a591f01a Mon Sep 17 00:00:00 2001
From: Jon Stanley <jonstanley@gmail.com>
Date: Nov 30 2012 05:41:19 +0000
Subject: Update to latest upstream


---

diff --git a/.gitignore b/.gitignore
index c645ac5..af6b4d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ noarch/
 .build*.log
 /infiniband-diags-1.5.12/
 /infiniband-diags-1.5.12.tar.gz
+/infiniband-diags-1.6.1.tar.gz
diff --git a/infiniband-diags.spec b/infiniband-diags.spec
index 387467b..56f2afc 100644
--- a/infiniband-diags.spec
+++ b/infiniband-diags.spec
@@ -1,12 +1,13 @@
 Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools
 Name: infiniband-diags 
-Version: 1.5.12
-Release: 2%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
+# Upstream allows either license to be used
 License: GPLv2 or BSD
 Group: System Environment/Libraries
 Url: http://openfabrics.org/
 Source0: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
-Patch0: infiniband-diags-1.5.8-all_hcas.patch
+#Patch0: infiniband-diags-1.5.8-all_hcas.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: opensm-devel > 3.3.8, libibumad-devel, libibmad-devel, perl
 Provides: perl(IBswcountlimits)
@@ -38,7 +39,7 @@ Static libraries for the infiniband-diags library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .hcas
+#%patch0 -p1 -b .hcas
 
 %build
 %configure --with-perl-installdir=%{_perldir}
@@ -78,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Fri Nov 30 2012 Jon Stanley <jonstanley@gmail.com>
+- Update to 1.6.1
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index a5479e0..83f7f4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a823a3f6d9cfa3d19e1ca6889f3c122  infiniband-diags-1.5.12.tar.gz
+d250e63f849b017f7149046c003cc8f6  infiniband-diags-1.6.1.tar.gz