[kopete] 4.13.97

[Rex Dieter]

commit 79710faf87fd70823117526d340eb73629671450
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Aug 6 09:12:23 2014 -0500

    4.13.97

 .gitignore                                         |   19 +------------------
 ..._iris.patch => kopete-4.13.97-system_iris.patch |   17 +++++++++--------
 kopete.spec                                        |    7 +++++--
 sources                                            |    2 +-
 4 files changed, 16 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e4c5ef..03cd497 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1 @@
-/kopete-4.11.0.tar.xz
-/kopete-4.11.1.tar.xz
-/kopete-4.11.2.tar.xz
-/kopete-4.11.3.tar.xz
-/kopete-4.11.90.tar.xz
-/kopete-4.11.95.tar.xz
-/kopete-4.11.97.tar.xz
-/kopete-4.12.0.tar.xz
-/kopete-4.12.1.tar.xz
-/kopete-4.12.2.tar.xz
-/kopete-4.12.3.tar.xz
-/kopete-4.12.90.tar.xz
-/kopete-4.12.95.tar.xz
-/kopete-4.12.97.tar.xz
-/kopete-4.13.0.tar.xz
-/kopete-4.13.1.tar.xz
-/kopete-4.13.2.tar.xz
-/kopete-4.13.3.tar.xz
+/kopete-4.13.97.tar.xz
diff --git a/kopete-4.11.95-system_iris.patch b/kopete-4.13.97-system_iris.patch
similarity index 74%
rename from kopete-4.11.95-system_iris.patch
rename to kopete-4.13.97-system_iris.patch
index 3e76f09..220ad80 100644
--- a/kopete-4.11.95-system_iris.patch
+++ b/kopete-4.13.97-system_iris.patch
@@ -1,7 +1,7 @@
-diff -up kopete-4.11.95/protocols/jabber/CMakeLists.txt.system_iris kopete-4.11.95/protocols/jabber/CMakeLists.txt
---- kopete-4.11.95/protocols/jabber/CMakeLists.txt.system_iris	2013-11-20 11:41:22.000000000 -0600
-+++ kopete-4.11.95/protocols/jabber/CMakeLists.txt	2013-11-23 00:16:47.590399786 -0600
-@@ -1,17 +1,29 @@
+diff -up kopete-4.13.97/protocols/jabber/CMakeLists.txt.system_iris kopete-4.13.97/protocols/jabber/CMakeLists.txt
+--- kopete-4.13.97/protocols/jabber/CMakeLists.txt.system_iris	2014-07-25 12:38:25.000000000 -0500
++++ kopete-4.13.97/protocols/jabber/CMakeLists.txt	2014-08-06 09:10:55.003314514 -0500
+@@ -1,17 +1,30 @@
  add_definitions(-DIRIS_XMPP_JID_DEPRECATED)
  
  add_subdirectory( icons ) 
@@ -27,12 +27,13 @@ diff -up kopete-4.11.95/protocols/jabber/CMakeLists.txt.system_iris kopete-4.11.
  ${CMAKE_CURRENT_SOURCE_DIR}/libiris/src
  ${QCA2_INCLUDE_DIR}
  )
++#link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ ${CMAKE_CURRENT_BINARY_DIR}/jingle/ )
 +link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ )
 +endif(USE_SYSTEM_IRIS)
  
- if(BUILD_GOOGLETALK)
-   add_subdirectory(googletalk/libjingle)
-@@ -24,9 +36,6 @@ IF(BUILD_JINGLE)
+ if(BUILD_LIBJINGLE)
+   add_subdirectory(libjingle)
+@@ -23,9 +36,6 @@ IF(BUILD_JINGLE)
    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jingle)
  ENDIF(BUILD_JINGLE)
  
@@ -42,7 +43,7 @@ diff -up kopete-4.11.95/protocols/jabber/CMakeLists.txt.system_iris kopete-4.11.
  ########### next target ###############
  
  set(kopete_jabber_ui_SRCS 
-@@ -160,7 +169,13 @@ endif(BUILD_JINGLE)
+@@ -159,7 +169,13 @@ endif(BUILD_JINGLE)
  kde4_add_plugin(kopete_jabber ${kopete_jabber_PART_SRCS})
  
  
diff --git a/kopete.spec b/kopete.spec
index fad1ab1..1cc2b22 100644
--- a/kopete.spec
+++ b/kopete.spec
@@ -8,7 +8,7 @@
 
 Name:    kopete
 Summary: Instant messenger
-Version: 4.13.3
+Version: 4.13.97
 Release: 1%{?dist}
 
 License: GPLv2+ and GFDL
@@ -23,7 +23,7 @@ URL:     http://kopete.kde.org/
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
 # support USE_SYSTEM_IRIS build option
-Patch1: kopete-4.11.95-system_iris.patch
+Patch1: kopete-4.13.97-system_iris.patch
 
 ## upstreamable patches
 
@@ -203,6 +203,9 @@ fi
 
 
 %changelog
+* Tue Aug 05 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.13.97-1
+- 4.13.97
+
 * Tue Jul 15 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.13.3-1
 - 4.13.3
 
diff --git a/sources b/sources
index 9dc04a0..346a458 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cbc098427b5a2d96e1bad7c1c093234  kopete-4.13.3.tar.xz
+888300982644eb5b4cb87fb4841fdc80  kopete-4.13.97.tar.xz