From 2106773f2998fcb34b40ed9e37ac1e5c4d2ecf65 Mon Sep 17 00:00:00 2001
From: François Cami <fcami@fedoraproject.org>
Date: Apr 10 2014 15:32:31 +0000
Subject: Merge branch 'master' into f19


---

diff --git a/iperf3.spec b/iperf3.spec
index 9b737e6..99c4b1c 100644
--- a/iperf3.spec
+++ b/iperf3.spec
@@ -1,14 +1,14 @@
-Name:	iperf3
-Version: 3.0.3
-Release:	2%{?dist}
-Summary: Measurement tool for TCP/UDP bandwidth performance
-
-Group:	 Applications/Internet	
-License: BSD	
-URL:	 http://github.com/esnet/iperf
-Source0: http://stats.es.net/software/iperf-%{version}.tar.gz
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: libuuid-devel	
+Name:           iperf3
+Version:        3.0.3
+Release:        3%{?dist}
+Summary:        Measurement tool for TCP/UDP bandwidth performance
+
+Group:          Applications/Internet
+License:        BSD
+URL:            http://github.com/esnet/iperf
+Source0:        http://stats.es.net/software/iperf-%{version}.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires:  libuuid-devel
 
 %description
 Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of
@@ -18,6 +18,7 @@ jitter, data-gram loss.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -27,34 +28,43 @@ developing applications that use %{name}.
 %setup -q -n iperf-%{version}
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall -C src INSTALL_DIR="%{buildroot}%{_bindir}"
 mkdir -p %{buildroot}%{_mandir}/man1
+rm -f %{buildroot}%{_libdir}/libiperf.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS README.md LICENSE INSTALL RELEASE_NOTES
+%doc AUTHORS README.md LICENSE RELEASE_NOTES
 %{_mandir}/man1/iperf3.1.gz
 %{_mandir}/man3/libiperf.3.gz
 %{_bindir}/iperf3
 %{_libdir}/*.so.*
 
-%files devel
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files          devel
 %defattr(-,root,root,-)
 %{_includedir}/iperf_api.h
-%{_libdir}/libiperf.a
-%{_libdir}/libiperf.la
 %{_libdir}/*.so
 %{_libdir}/*.so.*
 
 %changelog
+* Wed Apr 2 2014 François Cami <fcami@fedoraproject.org> - 3.0.3-3
+- Drop static library support (#1081486).
+- iperf3-devel subpackage must require iperf3.
+- iperf3-devel should only contain the unversioned shared library.
+- Call ldconfig since we are installing a shared library now.
+- Removed INSTALL file.
+
 * Wed Apr 2 2014 Susant Sahani <ssahani@redhat.com> 3.0.3-2
 - Moved static library to devel section only .