[telepathy-qt4] Update to 0.9.5
Jan Grulich
jgrulich at fedoraproject.org
Wed Sep 17 09:23:53 UTC 2014
commit 34a47d31f0c440c63aefab19d0e0ce225137b02b
Author: Jan Grulich <jgrulich at redhat.com>
Date: Wed Sep 17 11:20:36 2014 +0200
Update to 0.9.5
.gitignore | 1 +
sources | 2 +-
telepathy-qt-0.9.3-farstream02.patch | 41 ----------------
telepathy-qt-0.9.3-farstream_compat.patch | 44 ++++++++++--------
telepathy-qt-0.9.3-gstreamer1.patch | 72 -----------------------------
telepathy-qt4.spec | 21 ++++----
6 files changed, 36 insertions(+), 145 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b67052..8fce7a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/telepathy-qt-0.9.2.tar.gz
/telepathy-qt-0.9.3.tar.gz
/telepathy-qt-0.9.3.1-0191a6dd.tar.gz
+/telepathy-qt-0.9.5.tar.gz
diff --git a/sources b/sources
index a81a520..7be20b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad10122a406bda35577faad8b8e095b3 telepathy-qt-0.9.3.1-0191a6dd.tar.gz
+22c0daa7e4f7e48e779f703c9b27b816 telepathy-qt-0.9.5.tar.gz
diff --git a/telepathy-qt-0.9.3-farstream_compat.patch b/telepathy-qt-0.9.3-farstream_compat.patch
index e77e521..3539e0e 100644
--- a/telepathy-qt-0.9.3-farstream_compat.patch
+++ b/telepathy-qt-0.9.3-farstream_compat.patch
@@ -1,6 +1,7 @@
-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
+diff --git a/cmake/modules/FindTelepathyFarstream.cmake b/cmake/modules/FindTelepathyFarstream.cmake
+index 74b12d8..215ed28 100644
+--- a/cmake/modules/FindTelepathyFarstream.cmake
++++ b/cmake/modules/FindTelepathyFarstream.cmake
@@ -23,9 +23,9 @@ if (NOT WIN32)
# in the find_path() and find_library() calls
find_package(PkgConfig)
@@ -13,7 +14,7 @@ diff -up telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake.farstream
endif (TELEPATHY_FARSTREAM_MIN_VERSION)
set(TELEPATHY_FARSTREAM_DEFINITIONS ${PC_TELEPATHY_FARSTREAM_CFLAGS_OTHER})
endif (NOT WIN32)
-@@ -34,10 +34,10 @@ find_path(TELEPATHY_FARSTREAM_INCLUDE_DI
+@@ -34,10 +34,10 @@ find_path(TELEPATHY_FARSTREAM_INCLUDE_DIR telepathy-farstream/telepathy-farstrea
PATHS
${PC_TELEPATHY_FARSTREAM_INCLUDEDIR}
${PC_TELEPATHY_FARSTREAM_INCLUDE_DIRS}
@@ -26,25 +27,28 @@ diff -up telepathy-qt-0.9.3/cmake/modules/FindTelepathyFarstream.cmake.farstream
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
+diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
+index 8861e36..bd040ed 100644
+--- a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
++++ b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
@@ -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}
+-Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
++Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${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/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
+index ccebb47..f5d3299 100644
+--- a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
++++ b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
+@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
+ Name: TelepathyQt${QT_VERSION_MAJOR}Farstream
+ Description: Qt Telepathy Farstream utility library for the Telepathy framework
+ Version: ${PACKAGE_VERSION}
+-Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
++Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${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 --git a/telepathy-qt4.spec b/telepathy-qt4.spec
index 6fe66a5..70b363c 100644
--- a/telepathy-qt4.spec
+++ b/telepathy-qt4.spec
@@ -11,13 +11,15 @@
# to 20 and RHEL up to 7. (Up to RHEL 6, GStreamer 0.10 is the only option.)
%endif
+%if 0%{?build_from_snapshot}
%global snap 20140403
%global git_commit 0191a6ddf0c094d9ae61b9ee48f1b282e13a9ef2
%global git_hash 0191a6dd
+%endif
Name: telepathy-qt4
-Version: 0.9.3.1
-Release: 0.4.%{snap}git%{git_hash}%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
Summary: High-level bindings for Telepathy
License: LGPLv2+
@@ -35,10 +37,6 @@ Source0: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{v
Patch50: telepathy-qt-0.9.3-farstream_compat.patch
## upstream patches
-# FindFarstream.cmake: look for farstream 0.2 instead of 0.1 (Diane Trout)
-Patch100: telepathy-qt-0.9.3-farstream02.patch
-# FindGStreamer.cmake: look for GStreamer 1 instead of 0.10 (Alin Elena)
-Patch101: telepathy-qt-0.9.3-gstreamer1.patch
Provides: telepathy-qt = %{version}-%{release}
Provides: telepathy-qt%{?_isa} = %{version}-%{release}
@@ -114,11 +112,6 @@ Provides: telepathy-qt-farstream = %{version}-%{release}
%patch50 -p1 -b .farstream_compat
%endif
-%if 0%{?farstream02}
-%patch100 -p1 -b .farstream02
-%patch101 -p1 -b .gstreamer1
-%endif
-
%build
mkdir -p %{_target_platform}
@@ -161,8 +154,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%{_includedir}/telepathy-qt4/TelepathyQt/
%{_libdir}/libtelepathy-qt4.so
%{_libdir}/pkgconfig/TelepathyQt4.pc
+%{_libdir}/pkgconfig/TelepathyQt4Service.pc
%dir %{_libdir}/cmake
%{_libdir}/cmake/TelepathyQt4/
+%{_libdir}/cmake/TelepathyQt4Service/
+%{_libdir}/libtelepathy-qt4-service.a
%if 0%{?farstream}
%{_libdir}/libtelepathy-qt4-farstream.so
%{_libdir}/pkgconfig/TelepathyQt4Farstream.pc
@@ -171,6 +167,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Wed Sep 17 2014 Jan Grulich <jgrulich at redhat.com> - 0.9.5.0-1
+- Update to 0.9.5.0
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3.1-0.4.20140403git0191a6dd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list