From 80602d799e223edd6e1d1d9a47c105595ffced2d8fb20abeeb45f7680bda3cd3 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Fri, 22 Jun 2012 15:20:21 +0000
Subject: [PATCH] Accepting request 125813 from
 home:coolo:branches:openSUSE:Factory

- disable _service file for factory update
- update license to be spdx.org conform

OBS-URL: https://build.opensuse.org/request/show/125813
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iperf?expand=0&rev=9
---
 _service            | 13 +++++++++++++
 iperf-2.0.4.tar.bz2 |  3 ---
 iperf-2.0.5.tar.gz  |  3 +++
 iperf.changes       | 24 ++++++++++++++++++++++++
 iperf.spec          | 37 +++++++++++++++----------------------
 5 files changed, 55 insertions(+), 25 deletions(-)
 create mode 100644 _service
 delete mode 100644 iperf-2.0.4.tar.bz2
 create mode 100644 iperf-2.0.5.tar.gz

diff --git a/_service b/_service
new file mode 100644
index 0000000..509cc9a
--- /dev/null
+++ b/_service
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<services>
+  <service name="download_url" mode="localonly">
+    <param name="protocol">https</param>
+    <param name="host">downloads.sourceforge.net</param>
+    <param name="path">/project/iperf/iperf-2.0.5.tar.gz</param>
+  </service>
+  <service name="verify_file" mode="localonly">
+    <param name="file">iperf-2.0.5.tar.gz</param>
+    <param name="verifier">sha256</param>
+    <param name="checksum">636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b</param>
+  </service>
+</services>
diff --git a/iperf-2.0.4.tar.bz2 b/iperf-2.0.4.tar.bz2
deleted file mode 100644
index b3eb954..0000000
--- a/iperf-2.0.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2bb434a54598e7b288765408f1fec19437cbfb65d6246c068e434410c66b812
-size 201163
diff --git a/iperf-2.0.5.tar.gz b/iperf-2.0.5.tar.gz
new file mode 100644
index 0000000..c1ae513
--- /dev/null
+++ b/iperf-2.0.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b
+size 248583
diff --git a/iperf.changes b/iperf.changes
index ad813d6..2d59e12 100644
--- a/iperf.changes
+++ b/iperf.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Jun 22 13:59:52 UTC 2012 - coolo@suse.com
+
+- disable _service file for factory update
+- update license to be spdx.org conform
+
+-------------------------------------------------------------------
+Fri Aug 27 18:18:45 UTC 2010 - reddwarf@opensuse.org
+
+- Update to 2.0.5
+  * bumped default TCP send/recv buffer to 128K (this is not the
+    kernel buffer that controls the window, but rather the Iperf
+    internal buffer)
+  * honor -i flag when for a server (-s) when using TCP
+  * Exit rather than warn on connection failure
+  * Reduce CPU usage
+  * "neater" output for some units, eg Kbps, Mbps, Gbps
+  * addresses some typos
+  * prevent underflow when the amount of data to be
+    transmitted (-n) is not a multiple of the buffer size (-l)
+  * print report headers only once
+  * use appropriate report header for UDP tests
+- Cleaned with spec-cleaner
+
 -------------------------------------------------------------------
 Tue Mar 30 13:03:23 UTC 2010 - poletti.marco@gmail.com
 
diff --git a/iperf.spec b/iperf.spec
index 4eb685c..86e6c3b 100644
--- a/iperf.spec
+++ b/iperf.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package iperf (Version 2.0.4)
+# spec file for package iperf
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,16 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           iperf
-License:        UI License
-AutoReqProv:    on
-Version:        2.0.4
-Release:        1
-BuildRequires:  gcc-c++
+Version:        2.0.5
+Release:        0
 Summary:        A Tool To Measure Network Performance
-Source:         %{name}-%{version}.tar.bz2
-Url:            http://sourceforge.net/projects/iperf/
+License:        NCSA
 Group:          Productivity/Networking/Other
+Url:            http://sourceforge.net/projects/iperf/
+Source:         %{name}-%{version}.tar.gz
+BuildRequires:  gcc-c++
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -36,26 +33,22 @@ measuring maximum TCP and UDP bandwidth performance.
 Iperf allows the tuning of various parameters and UDP characteristics.
 Iperf reports bandwidth, delay jitter, datagram loss.
 
-
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
 %configure
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-%make_install
+%makeinstall
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
-
-%defattr(755,root,root)
-%{_prefix}/bin/iperf
-
-%defattr(644,root,root)
-%doc %{_mandir}/man1/iperf.1.gz
+%defattr(0644,root,root,0755)
+%attr(0755,root,root) %{_bindir}/%{name}
+%doc %{_mandir}/man1/%{name}.1%{ext_man}
 
 %changelog