[kdenetwork] 7:4.10.2-4

[Rex Dieter]

commit 55bdeb4641ec4942a3f703183696c65dec122938
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed May 1 16:57:43 2013 -0500

    7:4.10.2-4
    
    - use system iris (#737305, f20+ only for now)
    - .spec cleanup

 kdenetwork.spec |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/kdenetwork.spec b/kdenetwork.spec
index 97912d1..781c6df 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -1,12 +1,16 @@
+
+#if 0%{?fedora} > 19
+%define use_system_iris 1
+#endif
+
 Summary: KDE Network Applications
 Name:    kdenetwork
 Epoch:   7
 Version: 4.10.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
-Group: Applications/Internet
-URL: http://www.kde.org
+URL:     http://www.kde.org
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
 %global stable unstable
@@ -52,8 +56,6 @@ BuildRequires: libktorrent-devel
 BuildRequires: pkgconfig(nxcl)
 %global telepathy 1
 BuildRequires: pkgconfig(TelepathyQt4)
-#define use_system_iris 1
-#BuildRequires: pkgconfig(iris)
 BuildRequires: linphone-devel >= 2.3.0
 %endif
 BuildRequires: boost-devel
@@ -78,6 +80,10 @@ BuildRequires: pkgconfig(libstreamanalyzer) pkgconfig(libstreams)
 BuildRequires: pkgconfig(libxslt)
 BuildRequires: pkgconfig(meanwhile)
 BuildRequires: pkgconfig(ortp)
+%if 0%{?use_system_iris:1}
+BuildRequires: pkgconfig(iris)
+BuildRequires: iris-devel >= 1.0.0-0.13.20110904svn812
+%endif
 BuildRequires: pkgconfig(qca2)
 BuildRequires: pkgconfig(qimageblitz)
 BuildRequires: pkgconfig(soprano)
@@ -94,12 +100,6 @@ BuildRequires: openldap-devel
 #   * XMMS  <http://www.xmms.org>
 #     X MultiMedia System development libraries
 #     Used by the Kopete nowlistening plugin to support the XMMS player.
-#   * mediastreamer (2.3.0 or higher)  <http://www.linphone.org/index.php/eng/code_review/mediastreamer2>
-#     A streaming engine specialized for voice/video telephony applications
-#     Required to enable voice clips support in WLM plugin and needed to build Google Talk libjingle audio call support in Kopete.
-#   * msiLBC  <http://mirror.lihnidos.org/GNU/savannah/linphone/plugins/sources>
-#     iLBC is low bitrate audio codec - plugin for mediastreamer
-#     Needed to build Google Talk libjingle voice call support with iLBC codec
 
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires: %{name}-fileshare-samba = %{epoch}:%{version}-%{release}
@@ -243,6 +243,10 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
 %patch50 -p1 -b .libjingle_openssl
 %patch51 -p1 -b .v4l_deprecations
 
+%if 0%{?use_system_iris:1}
+rm -rfv kopete/protocols/jabber/libiris/
+%endif
+
 
 %build
 mkdir -p %{_target_platform}
@@ -298,10 +302,6 @@ for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
 done
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
 # blank
 
@@ -529,6 +529,10 @@ fi
 
 
 %changelog
+* Wed May 01 2013 Rex Dieter <rdieter at fedoraproject.org> - 7:4.10.2-4
+- use system iris (#737305, f20+ only for now)
+- .spec cleanup
+
 * Mon Apr 29 2013 Than Ngo <than at redhat.com> - 7:4.10.2-3
 - build kppp with -fno-strict-aliasing
 - fix multilib issue