[telepathy-logger-qt] QtGLib pkgconfig patch
Rex Dieter
rdieter at fedoraproject.org
Thu Jul 5 20:00:27 UTC 2012
commit 69dc86efdab3bc538a52fbcd173586c439c9cfda
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Jul 5 15:03:46 2012 -0500
QtGLib pkgconfig patch
telepathy-logger-qt-0.4.0-pkgconfig_QtGLib.patch | 22 ++++++++++++++++++++++
telepathy-logger-qt.spec | 13 ++++++++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/telepathy-logger-qt-0.4.0-pkgconfig_QtGLib.patch b/telepathy-logger-qt-0.4.0-pkgconfig_QtGLib.patch
new file mode 100644
index 0000000..60b636c
--- /dev/null
+++ b/telepathy-logger-qt-0.4.0-pkgconfig_QtGLib.patch
@@ -0,0 +1,22 @@
+diff -up telepathy-logger-qt-0.4.0/TelepathyLoggerQt4/TelepathyLoggerQt4.pc.in.deps telepathy-logger-qt-0.4.0/TelepathyLoggerQt4/TelepathyLoggerQt4.pc.in
+--- telepathy-logger-qt-0.4.0/TelepathyLoggerQt4/TelepathyLoggerQt4.pc.in.deps 2012-06-10 05:30:54.000000000 -0500
++++ telepathy-logger-qt-0.4.0/TelepathyLoggerQt4/TelepathyLoggerQt4.pc.in 2012-07-05 14:58:06.276318158 -0500
+@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INC
+ Name: Telepathy-Logger-Qt4
+ Description: Qt4 utility library to access logs in the Telepathy framework
+ Version: ${PACKAGE_VERSION}
+-Requires.private: QtCore >= 4.5, TelepathyQt4 >= 0.5
++Requires.private: QtCore >= 4.5, QtGLib-2.0, TelepathyQt4 >= 0.5
+ Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-logger-qt4
+ Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-logger-0.2
+diff -up telepathy-logger-qt-0.4.0/TelepathyLoggerQt4/TelepathyLoggerQt4-uninstalled.pc.in.deps telepathy-logger-qt-0.4.0/TelepathyLoggerQt4/TelepathyLoggerQt4-uninstalled.pc.in
+--- telepathy-logger-qt-0.4.0/TelepathyLoggerQt4/TelepathyLoggerQt4-uninstalled.pc.in.deps 2012-06-10 05:30:54.000000000 -0500
++++ telepathy-logger-qt-0.4.0/TelepathyLoggerQt4/TelepathyLoggerQt4-uninstalled.pc.in 2012-07-05 14:58:35.530952423 -0500
+@@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR}
+ Name: Telepathy-Logger-Qt4 (uninstalled copy)
+ Description: Qt4 utility library to access logs in the Telepathy framework
+ Version: ${PACKAGE_VERSION}
+-Requires.private: QtCore >= 4.5, TelepathyQt4 >= 0.5
++Requires.private: QtCore >= 4.5, QtGLib-2.0, TelepathyQt4 >= 0.5
+ Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/libtelepathy-logger-qt4.a
+ Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
diff --git a/telepathy-logger-qt.spec b/telepathy-logger-qt.spec
index 44db147..7f75320 100644
--- a/telepathy-logger-qt.spec
+++ b/telepathy-logger-qt.spec
@@ -1,12 +1,16 @@
Name: telepathy-logger-qt
Version: 0.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Telepathy Logging for Qt
License: LGPLv2+
URL: https://projects.kde.org/projects/extragear/network/telepathy/%{name}
Source0: http://download.kde.org/unstable/kde-telepathy/%{version}/src/%{name}-%{version}.tar.bz2
+## upstreamable patches
+# pkgconfig Requires.private: +QtGLib
+Patch50: telepathy-logger-qt-0.4.0-pkgconfig_QtGLib.patch
+
BuildRequires: bison
BuildRequires: cmake
BuildRequires: dbus-python python2-devel
@@ -23,6 +27,8 @@ BuildRequires: pkgconfig(libxml-2.0)
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
+# for parent include dir ownership (mostly)
+Requires: telepathy-logger-devel%{?_isa}
%description devel
%{summary}.
@@ -30,6 +36,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q -n telepathy-logger-qt-%{version}
+%patch50 -p1 -b pkgconfig_QtGLib
+
%build
mkdir -p %{_target_platform}
@@ -58,6 +66,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Thu Jul 05 2012 Rex Dieter <rdieter at fedoraproject.org> 0.4.0-2
+- QtGLib pkgconfig patch
+
* Mon Jun 11 2012 Rex Dieter <rdieter at fedoraproject.org> 0.4.0-1
- first try
More information about the scm-commits
mailing list