[kdenetwork] try use_system_iris again (#737305)

[Rex Dieter]

commit 780fe448629f9a8c00367787bc2f8e8f68076bb2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu May 2 09:00:43 2013 -0500

    try use_system_iris again (#737305)

 kdenetwork-4.10.0-kopete_system_iris.patch |    2 +-
 kdenetwork.spec                            |   11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/kdenetwork-4.10.0-kopete_system_iris.patch b/kdenetwork-4.10.0-kopete_system_iris.patch
index 09ce961..99cc7e1 100644
--- a/kdenetwork-4.10.0-kopete_system_iris.patch
+++ b/kdenetwork-4.10.0-kopete_system_iris.patch
@@ -16,7 +16,7 @@ diff -up kdenetwork-4.10.0/kopete/protocols/jabber/CMakeLists.txt.kopete_system_
 +
 +if(USE_SYSTEM_IRIS)
 +find_package(PkgConfig REQUIRED)
-+pkg_check_modules(IRIS REQUIRED iris)
++pkg_check_modules(IRIS REQUIRED iris irisnet)
 +include_directories( ${IRIS_INCLUDE_DIRS} )
 +link_directories( ${IRIS_LIBRARY_DIRS} )
 +else(USE_SYSTEM_IRIS)
diff --git a/kdenetwork.spec b/kdenetwork.spec
index 445e4a3..a0d9b08 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -1,14 +1,13 @@
 
 %if 0%{?fedora} > 19
-## needswork, see https://bugzilla.redhat.com/737305
-#define use_system_iris 1
+%define use_system_iris 1
 %endif
 
 Summary: KDE Network Applications
 Name:    kdenetwork
 Epoch:   7
 Version: 4.10.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org
@@ -245,7 +244,8 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
 %patch51 -p1 -b .v4l_deprecations
 
 %if 0%{?use_system_iris:1}
-rm -rfv kopete/protocols/jabber/libiris/
+mv kopete/protocols/jabber/libiris \
+   kopete/protocols/jabber/libiris.BAK
 %endif
 
 
@@ -530,6 +530,9 @@ fi
 
 
 %changelog
+* Thu May 02 2013 Rex Dieter <rdieter at fedoraproject.org> - 7:4.10.2-6
+- try use_system_iris again (#737305)
+
 * Wed May 01 2013 Rex Dieter <rdieter at fedoraproject.org> - 7:4.10.2-5
 - revert use_system_iris, needs more work