[qperf] Fix the fact that qperf was using the wrong PF_RDS define now that RDS is integrated upstream and it

[Doug Ledford]

commit 374b6888d0d5578520408f2be6138b23c12a2c05
Author: Doug Ledford <dledford at redhat.com>
Date:   Thu Apr 5 15:29:19 2012 -0400

    Fix the fact that qperf was using the wrong PF_RDS define now that RDS is integrated upstream and its assigned number is no longer temporary
    
    Signed-off-by: Doug Ledford <dledford at redhat.com>

 qperf-0.4.6-pf-define.patch |   15 +++++++++++++++
 qperf.spec                  |    8 +++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/qperf-0.4.6-pf-define.patch b/qperf-0.4.6-pf-define.patch
new file mode 100644
index 0000000..85667cf
--- /dev/null
+++ b/qperf-0.4.6-pf-define.patch
@@ -0,0 +1,15 @@
+diff -up qperf-0.4.6/src/rds.c.pf qperf-0.4.6/src/rds.c
+--- qperf-0.4.6/src/rds.c.pf	2012-04-05 15:25:52.517879535 -0400
++++ qperf-0.4.6/src/rds.c	2012-04-05 15:26:21.334879791 -0400
+@@ -48,7 +48,10 @@
+ /*
+  * Parameters.
+  */
+-#define AF_INET_RDS 28                  /* Family for RDS */
++#ifndef PF_RDS
++#define PF_RDS 28
++#endif
++#define AF_INET_RDS PF_RDS                  /* Family for RDS */
+ 
+ 
+ /*
diff --git a/qperf.spec b/qperf.spec
index 72d38a6..173876f 100644
--- a/qperf.spec
+++ b/qperf.spec
@@ -1,11 +1,12 @@
 Name:           qperf
 Summary:        Measure socket and RDMA performance
 Version:        0.4.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2 or BSD
 Group:          Networking/Diagnostic
 Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-0.1.gb81434e.tar.gz
 Patch0: qperf-0.4.4-noxrc.patch
+Patch1: qperf-0.4.6-pf-define.patch
 Url:            http://www.openfabrics.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libibverbs-devel >= 1.1.2-4, librdmacm-devel >= 1.0.8-5
@@ -16,6 +17,7 @@ Measure socket and RDMA performance.
 %prep
 %setup -q
 %patch0 -p1 -b .noxrc
+%patch1 -p1 -b .pf
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -36,6 +38,10 @@ rm -rf %{buildroot}
 %_mandir/man1/qperf.1*
 
 %changelog
+* Fri Dec 14 2012 Doug Ledford <dledford at redhat.com> - 0.4.6-6
+- Fix the fact that qperf was using the wrong PF_RDS define now that RDS
+  is integrated upstream and its assigned number is no longer temporary
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild