[ktp-common-internals] 0.5.80

[Rex Dieter]

commit 20b4f832dc2442bb284c7d12050ac55a59b58a05
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 7 08:26:09 2013 -0600

    0.5.80

 .gitignore                                       |    5 +---
 ktp-common-internals-0.5.80-cmake_buildfix.patch |   11 ++++++++
 ktp-common-internals.spec                        |   30 +++++++++++++++------
 sources                                          |    2 +-
 4 files changed, 34 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0be0242..5495349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/ktp-common-internals-0.4.1.tar.bz2
-/ktp-common-internals-0.5.1.tar.bz2
-/ktp-common-internals-0.5.2.tar.bz2
-/ktp-common-internals-0.5.3.tar.bz2
+/ktp-common-internals-0.5.80.tar.bz2
diff --git a/ktp-common-internals-0.5.80-cmake_buildfix.patch b/ktp-common-internals-0.5.80-cmake_buildfix.patch
new file mode 100644
index 0000000..f67342a
--- /dev/null
+++ b/ktp-common-internals-0.5.80-cmake_buildfix.patch
@@ -0,0 +1,11 @@
+diff -up ktp-common-internals-0.5.80/CMakeLists.txt.buildfix ktp-common-internals-0.5.80/CMakeLists.txt
+--- ktp-common-internals-0.5.80/CMakeLists.txt.buildfix	2013-03-07 07:41:04.884202443 -0600
++++ ktp-common-internals-0.5.80/CMakeLists.txt	2013-03-07 07:40:18.108787216 -0600
+@@ -1,6 +1,7 @@
+ project(ktp-common-internals)
+ 
+ cmake_minimum_required (VERSION 2.6.3 FATAL_ERROR)
++cmake_policy(SET CMP0002 OLD)
+ 
+ set (CMAKE_MODULE_PATH
+      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
diff --git a/ktp-common-internals.spec b/ktp-common-internals.spec
index 1662120..c0fe200 100644
--- a/ktp-common-internals.spec
+++ b/ktp-common-internals.spec
@@ -1,16 +1,20 @@
 
 Name:    ktp-common-internals 
 Summary: Common internals for KDE Telepathy 
-Version: 0.5.3
+Version: 0.5.80
 Release: 1%{?dist}
 
 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
+Patch50: ktp-common-internals-0.5.80-cmake_buildfix.patch
+
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
-BuildRequires: pkgconfig(TelepathyQt4) >= 0.9.2.1 
+BuildRequires: pkgconfig(TelepathyQt4) >= 0.9.3
+BuildRequires: pkgconfig(TelepathyLoggerQt4) >= %{version}
 
 %description
 %{summary}.
@@ -26,6 +30,8 @@ Requires: telepathy-qt4-devel
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch50 -p1 -b .cmake_buildfix
+
 
 %build
 mkdir -p %{_target_platform}
@@ -63,13 +69,16 @@ fi
 %{_kde4_bindir}/ktp-debugger
 %{_kde4_appsdir}/ktelepathy/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/libktpcommoninternalsprivate.so.3*
-%{_kde4_libdir}/libktpmodelsprivate.so.3*
-%{_kde4_libdir}/libktpwidgetsprivate.so.3*
-# wtf
-%{_kde4_libdir}/libktpcommoninternalsprivate.so.0.5*
-%{_kde4_libdir}/libktpmodelsprivate.so.0.5*
-%{_kde4_libdir}/libktpwidgetsprivate.so.0.5*
+# somebody lower in the stack should own these
+%dir %{_kde4_libdir}/kde4/imports/org
+%dir %{_kde4_libdir}/kde4/imports/org/kde
+%{_kde4_libdir}/kde4/imports/org/kde/telepathy/
+%{_kde4_libdir}/libktpcommoninternalsprivate.so.5*
+%{_kde4_libdir}/libktpmodelsprivate.so.5*
+%{_kde4_libdir}/libktpwidgetsprivate.so.5*
+%{_kde4_libdir}/libktpcommoninternalsprivate.so.%{version}
+%{_kde4_libdir}/libktpmodelsprivate.so.%{version}
+%{_kde4_libdir}/libktpwidgetsprivate.so.%{version}
 
 %files devel
 %{_kde4_libdir}/libktpcommoninternalsprivate.so
@@ -79,6 +88,9 @@ fi
 
 
 %changelog
+* Thu Mar 07 2013 Rex Dieter <rdieter at fedoraproject.org> 0.5.80-1
+- 0.5.80
+
 * Sun Feb 17 2013 Jan Grulich <jgrulich at redhat.com> - 0.5.3-1
 - 0.5.3
 
diff --git a/sources b/sources
index b91c1e4..df86f1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ee10d73be136c95c6788137245dc3e2  ktp-common-internals-0.5.3.tar.bz2
+4dccc39c8249fb637c5cfe32f613134f  ktp-common-internals-0.5.80.tar.bz2