[telepathy-qt4/f20] Revert previous merge from f21 branch
Jan Grulich
jgrulich at fedoraproject.org
Mon Oct 20 11:09:54 UTC 2014
commit 373542ae7f85bc025bbbab822b06ca1f07048d48
Author: Jan Grulich <jgrulich at redhat.com>
Date: Mon Oct 20 13:09:25 2014 +0200
Revert previous merge from f21 branch
.gitignore | 1 -
sources | 2 +-
telepathy-qt-0.9.3-farstream_compat.patch | 44 +++++++++++-------------
telepathy-qt4.spec | 53 +++++------------------------
4 files changed, 30 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8fce7a9..3b67052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
/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 7be20b7..a81a520 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22c0daa7e4f7e48e779f703c9b27b816 telepathy-qt-0.9.5.tar.gz
+ad10122a406bda35577faad8b8e095b3 telepathy-qt-0.9.3.1-0191a6dd.tar.gz
diff --git a/telepathy-qt-0.9.3-farstream_compat.patch b/telepathy-qt-0.9.3-farstream_compat.patch
index 3539e0e..e77e521 100644
--- a/telepathy-qt-0.9.3-farstream_compat.patch
+++ b/telepathy-qt-0.9.3-farstream_compat.patch
@@ -1,7 +1,6 @@
-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
+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)
@@ -14,7 +13,7 @@ index 74b12d8..215ed28 100644
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_DIR telepathy-farstream/telepathy-farstrea
+@@ -34,10 +34,10 @@ find_path(TELEPATHY_FARSTREAM_INCLUDE_DI
PATHS
${PC_TELEPATHY_FARSTREAM_INCLUDEDIR}
${PC_TELEPATHY_FARSTREAM_INCLUDE_DIRS}
@@ -27,28 +26,25 @@ index 74b12d8..215ed28 100644
PATHS
${PC_TELEPATHY_FARSTREAM_LIBDIR}
${PC_TELEPATHY_FARSTREAM_LIBRARY_DIRS}
-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
+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: 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}
+-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/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 70b363c..5f3009e 100644
--- a/telepathy-qt4.spec
+++ b/telepathy-qt4.spec
@@ -1,25 +1,15 @@
%if 0%{?fedora} > 16 || 0%{?rhel} >= 7
-%global farstream 1
+%define farstream 1
%endif
-%if 0%{?fedora} > 20 || 0%{?rhel} > 7
-# use Farstream 0.2 and GStreamer 1 on F21+ and RHEL8+
-%global farstream02 1
-# We don't want to use GStreamer 1 where the rest of the Qt 4 stack doesn't,
-# or we run into symbol conflicts. So build against GStreamer 0.10 on Fedora up
-# 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
+%define snap 20140403
+%define git_commit 0191a6ddf0c094d9ae61b9ee48f1b282e13a9ef2
+%define git_hash 0191a6dd
Name: telepathy-qt4
-Version: 0.9.5
-Release: 1%{?dist}
+Version: 0.9.3.1
+Release: 0.1.%{snap}git%{git_hash}%{?dist}
Summary: High-level bindings for Telepathy
License: LGPLv2+
@@ -36,36 +26,26 @@ Source0: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{v
# kinda sorta, help find fedora's compat-telepathy-farstream pkg
Patch50: telepathy-qt-0.9.3-farstream_compat.patch
-## upstream patches
-
Provides: telepathy-qt = %{version}-%{release}
Provides: telepathy-qt%{?_isa} = %{version}-%{release}
BuildRequires: cmake
BuildRequires: dbus-python python2-devel
BuildRequires: doxygen
+BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
BuildRequires: pkgconfig(QtDBus) pkgconfig(QtNetwork) pkgconfig(QtXml)
-%if 0%{?farstream02}
-BuildRequires: pkgconfig(gstreamer-1.0)
-BuildRequires: pkgconfig(farstream-0.2)
-BuildRequires: pkgconfig(telepathy-farstream)
-%else
-BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
%if 0%{?farstream}
BuildRequires: pkgconfig(farstream-0.1)
%if 0%{?fedora} > 17
## make sure to get the *right* telepathy-farstream
-%global compat_telepathy_farstream 1
+%define compat_telepathy_farstream 1
BuildRequires: compat-telepathy-farstream-devel
BuildRequires: pkgconfig(telepathy-farstream-0.4)
%else
BuildRequires: pkgconfig(telepathy-farstream)
%endif
-%endif
-%endif
-%if 0%{?farstream}
## unit tests
-%global enable_tests -DENABLE_TESTS:BOOL=ON
+%define enable_tests -DENABLE_TESTS:BOOL=ON
BuildRequires: pkgconfig(telepathy-glib) >= 0.19
BuildRequires: pkgconfig(gio-2.0)
%endif
@@ -154,11 +134,8 @@ 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
@@ -167,18 +144,6 @@ 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
-
-* Wed Jul 23 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.3.1-0.3.20140403git0191a6dd
-- build against farstream 0.2 and GStreamer 1 on F21+ (#1092654)
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3.1-0.2.20140403git0191a6dd
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
* Tue Apr 29 2014 Rex Dieter <rdieter at fedoraproject.org> 0.9.3.1-0.1.20140403git0191a6dd
- 0.9.3.1 snapshot, fixes FTBFS
More information about the scm-commits
mailing list