From c6b0da566c0b9466fd473ff351d7c21dc3e7ac15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <sharkcz@fedoraproject.org>
Date: Thu, 10 Jun 2010 07:13:42 +0000
Subject: [PATCH] - fix linking with --no-add-needed

---
 1000-ziomon-linker.patch | 12 ++++++++++++
 s390utils.spec           | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 1000-ziomon-linker.patch

diff --git a/1000-ziomon-linker.patch b/1000-ziomon-linker.patch
new file mode 100644
index 0000000..8405d47
--- /dev/null
+++ b/1000-ziomon-linker.patch
@@ -0,0 +1,12 @@
+diff -up s390-tools-1.8.2/ziomon/Makefile.linker s390-tools-1.8.2/ziomon/Makefile
+--- s390-tools-1.8.2/ziomon/Makefile.linker	2010-06-10 08:54:55.000000000 +0200
++++ s390-tools-1.8.2/ziomon/Makefile	2010-06-10 08:55:48.000000000 +0200
+@@ -21,7 +21,7 @@ ziomon_util: ziomon_util_main.o ziomon_t
+ ziomon_zfcpdd_main.o: ziomon_zfcpdd.c ziomon_zfcpdd.h
+ 	$(CC) -DWITH_MAIN $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ ziomon_zfcpdd: ziomon_zfcpdd_main.o ziomon_tools.o
+-	$(LINK) $^ -o $@ -lm -lrt
++	$(LINK) $^ -o $@ -lm -lrt -lpthread
+ 
+ ziorep_traffic: ziorep_traffic.o ziorep_framer.o ziorep_frameset.o \
+ 		ziorep_printers.o ziomon_dacc.o ziomon_util.o \
diff --git a/s390utils.spec b/s390utils.spec
index e40fc3b..5c46fcf 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.2
-Release:        10%{?dist}
+Release:        10%{?dist}.1
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,8 @@ Patch20:  0020-lstape-fix-return-code.patch
 Patch21:  0021-cpuplugd-fix-reading-the-size-of-proc-sys-vm-cmm_pag.patch
 Patch22:  0022-lsqeth-support-new-attributes.patch
 
+Patch1000:  1000-ziomon-linker.patch
+
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
 
@@ -150,6 +152,9 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
 # Support new attributes in lsqeth (#556915)
 %patch22 -p1 -b .lsqeth-new-attrs
 
+# Fix linking with --no-add-needed
+%patch1000 -p1 -b .linker
+
 #
 # cmsfs
 #
@@ -846,6 +851,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Thu Jun 10 2010 Dan Horák <dan[at]danny.cz> 2:1.8.2-10.1
+- fix linking with --no-add-needed
+
 * Wed Jan 20 2010 Dan Horák <dan[at]danny.cz> 2:1.8.2-10
 - fixed return codes in ziorep (#556849)
 - fixed return code in lstape (#556910)