[telepathy-qt4] respin farstream_compat patch

[Rex Dieter]

commit db7b803ab1c3055a8dd5a4c543e0f1322c7afd09
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 7 10:30:57 2013 -0600

    respin farstream_compat patch

 telepathy-qt-0.9.3-farstream_compat.patch |   28 +++++++++++++++++++++++++---
 telepathy-qt4.spec                        |   10 ++++------
 2 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/telepathy-qt-0.9.3-farstream_compat.patch b/telepathy-qt-0.9.3-farstream_compat.patch
index f4819da..e77e521 100644
--- a/telepathy-qt-0.9.3-farstream_compat.patch
+++ b/telepathy-qt-0.9.3-farstream_compat.patch
@@ -1,6 +1,6 @@
-diff -up telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake.compat telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake
---- telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake.compat	2012-07-13 12:40:23.000000000 -0500
-+++ telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake	2012-10-31 14:46:50.455757306 -0500
+diff -up telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake.farstream_compat telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake
+--- telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake.farstream_compat	2012-07-13 12:40:23.000000000 -0500
++++ telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake	2013-01-07 10:16:46.632238948 -0600
 @@ -23,9 +23,9 @@ if (NOT WIN32)
      # in the find_path() and find_library() calls
      find_package(PkgConfig)
@@ -26,3 +26,25 @@ diff -up telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake.compat te
     PATHS
     ${PC_TELEPATHY_FARSTREAM_LIBDIR}
     ${PC_TELEPATHY_FARSTREAM_LIBRARY_DIRS}
+diff -up telepathy-qt-0.9.3/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in.farstream_compat telepathy-qt-0.9.3/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
+--- telepathy-qt-0.9.3/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in.farstream_compat	2012-07-13 12:40:23.000000000 -0500
++++ telepathy-qt-0.9.3/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in	2013-01-07 10:18:10.329215783 -0600
+@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INC
+ Name: TelepathyQt${QT_VERSION_MAJOR}Farstream
+ Description: Qt Telepathy Farstream utility library for the Telepathy framework
+ Version: ${PACKAGE_VERSION}
+-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
++Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
+ Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farstream
+ Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
+diff -up telepathy-qt-0.9.3/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in.farstream_compat telepathy-qt-0.9.3/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
+--- telepathy-qt-0.9.3/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in.farstream_compat	2012-07-13 12:40:23.000000000 -0500
++++ telepathy-qt-0.9.3/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in	2013-01-07 10:18:24.809038717 -0600
+@@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR}
+ Name: TelepathyQt${QT_VERSION_MAJOR}Farstream (uninstalled copy)
+ Description: Qt Telepathy Farstream utility library for the Telepathy framework
+ Version: ${PACKAGE_VERSION}
+-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
++Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
+ Libs: ${CMAKE_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}/Farstream/libtelepathy-qt${QT_VERSION_MAJOR}-farstream.so
+ Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
diff --git a/telepathy-qt4.spec b/telepathy-qt4.spec
index 904ed28..416008b 100644
--- a/telepathy-qt4.spec
+++ b/telepathy-qt4.spec
@@ -5,7 +5,7 @@
 
 Name:    telepathy-qt4
 Version: 0.9.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: High-level bindings for Telepathy
 
 License: LGPLv2+
@@ -79,12 +79,7 @@ Provides:  telepathy-qt-farstream = %{version}-%{release}
 %setup -q -n telepathy-qt-%{version}
 
 %if 0%{?compat_telepathy_farstream}
-# should be safe to apply this unconditionally, but...
 %patch50 -p1 -b .farstream_compat
-sed -i.farstream_compat \
-  -e 's|telepathy-farstream|telepathy-farstream-0.4|g' \
-  TelepathyQt/Farstream/TelepathyQtFarstream.pc.in \
-  TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
 %endif
 
 
@@ -137,6 +132,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Mon Jan 07 2013 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-6
+- respin farstream_compat patch
+
 * Wed Oct 31 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-5
 - fix build for newer compat-telepathy-farstream