dvratil pushed to ktp-text-ui (f22). "Update to 15.04.0"

Mon Apr 27 18:30:30 UTC 2015

>From 793e0c04ed093156ffdd5a42ce5001d3fea53231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Mon, 27 Apr 2015 20:26:08 +0200
Subject: Update to 15.04.0

diff --git a/.gitignore b/.gitignore
index 60b7210..c1442e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /ktp-text-ui-0.8.1.tar.bz2
 /ktp-text-ui-0.8.80.tar.bz2
 /ktp-text-ui-0.9.0.tar.bz2
+/ktp-text-ui-15.04.0.tar.xz
diff --git a/ktp-text-ui-15.04-lib-soversion.patch b/ktp-text-ui-15.04-lib-soversion.patch
new file mode 100644
index 0000000..d682a41
--- /dev/null
+++ b/ktp-text-ui-15.04-lib-soversion.patch
@@ -0,0 +1,27 @@
+diff --git a/image-sharer/CMakeLists.txt b/image-sharer/CMakeLists.txt
+index 49aeff3..1f221d7 100644
+--- a/image-sharer/CMakeLists.txt
++++ b/image-sharer/CMakeLists.txt
+@@ -13,5 +13,8 @@ target_link_libraries(ktpimagesharer
+                       KF5::KIOWidgets
+                       KTp::OTR
+ )
++set_target_properties(ktpimagesharer PROPERTIES
++                      SOVERSION ${KTP_TEXT_UI_VERSION}
++)
+ 
+ install(TARGETS ktpimagesharer ${INSTALL_TARGETS_DEFAULT_ARGS})
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index f1ac4b9..a322a9e 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -33,6 +33,9 @@ set(ktpchat_UI
+ qt5_wrap_ui(ktpchat_SRCS ${ktpchat_UI})
+ 
+ add_library(ktpchat SHARED ${ktpchat_SRCS})
++set_target_properties(ktpchat PROPERTIES
++    SOVERSION ${KTP_TEXT_UI_VERSION}
++)
+ 
+ target_link_libraries(ktpchat
+     KF5::KIOWidgets
diff --git a/ktp-text-ui.spec b/ktp-text-ui.spec
index 9f17d49..c25b607 100644
--- a/ktp-text-ui.spec
+++ b/ktp-text-ui.spec
@@ -1,41 +1,58 @@
-
-## when telepathy-logger-qt is available
-%define logger 1
-
-Name:    ktp-text-ui
-Summary: Telepathy text chat handler
-Version: 0.9.0
-Release: 1%{?dist}
+Name:           ktp-text-ui
+Summary:        Telepathy text chat handler
+Version:        15.04.0
+Release:        1%{?dist}
 
 # GPLv2+: most code
 # (BSD or AFL): data/styles/renkoo.AdiumMessageStyle
 # MIT:  data/styles/simkete/, fadomatic javascript code used in Renkoo
-License: GPLv2+ and (BSD or AFL) and MIT
-URL:     https://projects.kde.org/projects/extragear/network/telepathy/%{name}
-# Remove .1 next time
-Source0: http://download.kde.org/stable/kde-telepathy/%{version}/src/%{name}-%{version}.tar.bz2
-
-BuildRequires: desktop-file-utils
-BuildRequires: dos2unix
-BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: kdelibs4-webkit-devel
-BuildRequires: ktp-common-internals-devel >= %{version}
-BuildRequires: pkgconfig(QJson)
-%if 0%{?logger}
-BuildRequires: pkgconfig(gio-2.0) pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(QtGLib-2.0)
-BuildRequires: pkgconfig(telepathy-logger-0.2)
-BuildRequires: pkgconfig(TelepathyLoggerQt4)
+License:        GPLv2+ and (BSD or AFL) and MIT
+URL:            https://projects.kde.org/projects/kde/kdenetwork/%{name}
+
+%global revision %(echo %{version} | cut -d. -f3)
+%if %{revision} >= 50
+%global stable unstable
+%else
+%global stable stable
 %endif
+Source0: http://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz
+
+## upstreamable patches
+Patch1: ktp-text-ui-15.04-lib-soversion.patch
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  dos2unix
+
+BuildRequires:  extra-cmake-modules
+BuildRequires:  kf5-rpm-macros
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtwebkit-devel
+
+BuildRequires:  kf5-karchive-devel
+BuildRequires:  kf5-sonnet-devel
+BuildRequires:  kf5-kwidgetsaddons-devel
+BuildRequires:  kf5-kservice-devel
+BuildRequires:  kf5-kemoticons-devel
+BuildRequires:  kf5-kio-devel
+BuildRequires:  kf5-kcmutils-devel
+BuildRequires:  kf5-knotifyconfig-devel
+BuildRequires:  kf5-knotifications-devel
+BuildRequires:  kf5-ki18n-devel
+BuildRequires:  kf5-kdewebkit-devel
+BuildRequires:  kf5-kwindowsystem-devel
+BuildRequires:  kf5-kxmlgui-devel
+BuildRequires:  kf5-kitemviews-devel
+
+BuildRequires:  ktp-common-internals-devel >= %{version}
+BuildRequires:  telepathy-logger-qt-devel
 
-Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
-Requires: ktp-accounts-kcm
 
-Obsoletes: telepathy-kde-text-ui < 0.3.0
-Provides:  telepathy-kde-text-ui = %{version}-%{release}
+Requires:       ktp-accounts-kcm
 
-Obsoletes: ktp-text-ui-devel < 0.6.80
+Obsoletes:      telepathy-kde-text-ui < 0.3.0
+Provides:       telepathy-kde-text-ui = %{version}-%{release}
+
+Obsoletes:      ktp-text-ui-devel < 0.6.80
 
 %description
 %{summary}.
@@ -44,6 +61,8 @@ Obsoletes: ktp-text-ui-devel < 0.6.80
 %prep
 %setup -qn %{name}-%{version}
 
+%patch1 -p1 -b .soversion
+
 # looks like someone cat'd several files with different encoding (and line endings)
 # into one.  we'll do our best to make it usable
 mac2unix data/styles/renkoo.AdiumMessageStyle/Contents/Resources/Renkoo*LICENSE.txt
@@ -52,7 +71,7 @@ mac2unix data/styles/renkoo.AdiumMessageStyle/Contents/Resources/Renkoo*LICENSE.
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -61,54 +80,54 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --all-name --with-kde
-
+# remove files we don't install
+rm -v %{buildroot}/%{_libdir}/libktpimagesharer.so
+rm -v %{buildroot}/%{_libdir}/libktpchat.so
 
 %check
-%if 0%{?logger}
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/ktp-log-viewer.desktop
-%endif
+desktop-file-validate %{buildroot}%{_datadir}/applications/ktp-log-viewer.desktop
 
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f %{name}.lang
-%doc COPYING 
+%files
+%license COPYING
 %doc data/styles/renkoo.AdiumMessageStyle/Contents/Resources/Renkoo*LICENSE.txt
 %doc data/styles/SimKete.AdiumMessageStyle/Contents/README
-%if 0%{?logger}
-%{_kde4_bindir}/ktp-log-viewer
-%{_kde4_datadir}/applications/kde4/ktp-log-viewer.desktop
-%{_kde4_appsdir}/ktp-log-viewer/
-%endif
-%{_kde4_libdir}/libktpchat.so
-%{_kde4_libdir}/libktpimagesharer.so
-%{_kde4_libdir}/kde4/kcm_ktp_chat_appearance.so
-%{_kde4_libdir}/kde4/kcm_ktp_chat_behavior.so
-%{_kde4_libdir}/kde4/kcm_ktp_chat_messages.so
-%{_kde4_libdir}/kde4/kcm_ktp_chat_otr.so
-%{_kde4_libdir}/kde4/kcm_ktp_logviewer_behavior.so
-%{_kde4_libdir}/kde4/kcm_ktptextui_message_filter_latex.so
-%{_kde4_libdir}/kde4/ktptextui_message_filter_*.so
-%{_kde4_libexecdir}/ktp-adiumxtra-protocol-handler
-%{_kde4_libexecdir}/ktp-text-ui
-%{_kde4_datadir}/kde4/services/kcm_ktp_chat_appearance.desktop
-%{_kde4_datadir}/kde4/services/kcm_ktp_chat_behavior.desktop
-%{_kde4_datadir}/kde4/services/kcm_ktp_chat_messages.desktop
-%{_kde4_datadir}/kde4/services/kcm_ktp_chat_otr.desktop
-%{_kde4_datadir}/kde4/services/kcm_ktp_logviewer_behavior.desktop
-%{_kde4_datadir}/kde4/services/kcm_ktptextui_message_filter_latex.desktop
-%{_kde4_datadir}/kde4/services/ktptextui_message_filter_*.desktop
-%{_kde4_datadir}/kde4/servicetypes/ktptxtui_message_filter.desktop
-%{_kde4_appsdir}/ktelepathy/
-%{_kde4_appsdir}/ktp-text-ui/
-%{_kde4_datadir}/kde4/services/adiumxtra.protocol
+%{_bindir}/ktp-log-viewer
+%{_datadir}/applications/ktp-log-viewer.desktop
+%{_datadir}/ktp-log-viewer/
+%{_libdir}/libktpimagesharer.so.*
+%{_libdir}/libktpchat.so.*
+%{_kf5_qtplugindir}/kcm_ktp_chat_appearance.so
+%{_kf5_qtplugindir}/kcm_ktp_chat_behavior.so
+%{_kf5_qtplugindir}/kcm_ktp_chat_messages.so
+%{_kf5_qtplugindir}/kcm_ktp_chat_otr.so
+%{_kf5_qtplugindir}/kcm_ktp_logviewer_behavior.so
+%{_kf5_qtplugindir}/kcm_ktptextui_message_filter_latex.so
+%{_kf5_qtplugindir}/ktptextui_message_filter_*.so
+%{_libexecdir}/ktp-adiumxtra-protocol-handler
+%{_libexecdir}/ktp-text-ui
+%{_kf5_datadir}/kservices5/kcm_ktp_chat_appearance.desktop
+%{_kf5_datadir}/kservices5/kcm_ktp_chat_behavior.desktop
+%{_kf5_datadir}/kservices5/kcm_ktp_chat_messages.desktop
+%{_kf5_datadir}/kservices5/kcm_ktp_chat_otr.desktop
+%{_kf5_datadir}/kservices5/kcm_ktp_logviewer_behavior.desktop
+%{_kf5_datadir}/kservices5/kcm_ktptextui_message_filter_latex.desktop
+%{_kf5_datadir}/kservices5/ktptextui_message_filter_*.desktop
+%{_kf5_datadir}/kservices5/adiumxtra.protocol
+%{_kf5_datadir}/kservicetypes5/ktptxtui_message_filter.desktop
+%{_datadir}/ktelepathy/
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.TextUi.service
 %{_datadir}/telepathy/clients/KTp.TextUi.client
+%{_kf5_datadir}/kxmlgui5/ktp-text-ui
 
 
 %changelog
+* Mon Apr 27 2015 Daniel Vrátil <dvratil at redhat.com> - 15.04.0-1
+- Update to 15.04.0
+
 * Mon Oct 20 2014 Jan Grulich <jgrulich at redhat.com> - 0.9.0-1
 - Update to 0.9.0
 
diff --git a/sources b/sources
index fe4e0bd..be093ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76e8c2f3679fc14da49993d853d2ed49  ktp-text-ui-0.9.0.tar.bz2
+08b9115a48572d691dd08096c43af0a4  ktp-text-ui-15.04.0.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ktp-text-ui.git/commit/?h=f22&id=793e0c04ed093156ffdd5a42ce5001d3fea53231
