From 17f04d7a968e590a735241c4babdea0643de54423deaf1a2119d5165fe6846a6 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 3 Dec 2016 12:26:10 +0000 Subject: [PATCH] Accepting request 443460 from home:luca_b:test_KA KDE Applications - please review OBS-URL: https://build.opensuse.org/request/show/443460 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/mobipocket?expand=0&rev=34 --- kde4_includes.patch | 11 -------- kdegraphics-mobipocket-16.08.3.tar.xz | 3 --- kdegraphics-mobipocket-16.11.80.tar.xz | 3 +++ mobipocket.changes | 10 +++++++ mobipocket.spec | 36 +++++++++++++------------- 5 files changed, 31 insertions(+), 32 deletions(-) delete mode 100644 kde4_includes.patch delete mode 100644 kdegraphics-mobipocket-16.08.3.tar.xz create mode 100644 kdegraphics-mobipocket-16.11.80.tar.xz diff --git a/kde4_includes.patch b/kde4_includes.patch deleted file mode 100644 index e7a6c45..0000000 --- a/kde4_includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdegraphics-mobipocket-4.13.90.orig/QMobipocketConfig.cmake 2013-11-04 21:42:18.000000000 +0100 -+++ kdegraphics-mobipocket-4.13.90/QMobipocketConfig.cmake 2014-08-13 00:13:33.815194116 +0200 -@@ -5,7 +5,7 @@ get_filename_component( _currentDir ${_ - - # find the full paths to the library and the includes: - find_path(QMOBIPOCKET_INCLUDE_DIR qmobipocket/mobipocket.h -- HINTS ${_currentDir}/include -+ HINTS ${_currentDir}/include ${KDE4_INCLUDE_DIR} - NO_DEFAULT_PATH) - - find_library(QMOBIPOCKET_LIBRARY qmobipocket diff --git a/kdegraphics-mobipocket-16.08.3.tar.xz b/kdegraphics-mobipocket-16.08.3.tar.xz deleted file mode 100644 index ac2adb7..0000000 --- a/kdegraphics-mobipocket-16.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d67fa0b0d29e93306912ff6c79797a418ed3fba624111d5ac9d2d9009b77165 -size 14848 diff --git a/kdegraphics-mobipocket-16.11.80.tar.xz b/kdegraphics-mobipocket-16.11.80.tar.xz new file mode 100644 index 0000000..9b4d1ad --- /dev/null +++ b/kdegraphics-mobipocket-16.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a35bad0b46d00aa73eaab1fd3d1e8b9191b44b410bb98a3f5bedbc7191ce47a4 +size 13408 diff --git a/mobipocket.changes b/mobipocket.changes index 6b52454..08095f3 100644 --- a/mobipocket.changes +++ b/mobipocket.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 29 12:43:06 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.11.80 + * KDE Applications 16.12.0 Beta + * https://www.kde.org/announcements/announce-applications-16.12-beta.php + +- Dropped patches: + + kde4_includes.patch + ------------------------------------------------------------------- Wed Nov 9 06:28:29 UTC 2016 - lbeltrame@kde.org diff --git a/mobipocket.spec b/mobipocket.spec index 7365abc..f8c4431 100644 --- a/mobipocket.spec +++ b/mobipocket.spec @@ -1,7 +1,7 @@ # # spec file for package mobipocket # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,21 @@ Name: mobipocket -Version: 16.08.3 +Version: 16.11.80 Release: 0 +%define kf5_version 5.26.0 +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: E-book plugin and library License: GPL-2.0+ Group: Productivity/Office/Other Url: http://www.kde.org Source: kdegraphics-mobipocket-%{version}.tar.xz -# PATCH-FIX-UPSTREAM kde4_includes.patch -- search for includes in standard kde4 include directory (don't assume it's hardcoded to include/ ) -Patch0: kde4_includes.patch -BuildRequires: libkde4-devel -BuildRequires: xz +BuildRequires: extra-cmake-modules +BuildRequires: kio-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,7 +41,6 @@ Mobipocket E-book support for Okular. Summary: E-book plugin and library Group: System/GUI/KDE Requires: %{name} = %{version} -Requires: libkde4-devel %description devel Mobipocket E-book plugin and library. @@ -47,30 +50,27 @@ library %prep %setup -q -n kdegraphics-mobipocket-%{version} -%patch0 -p1 %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - %kde4_makeinstall -C build - %kde_post_install + %kf5_makeinstall -C build %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files %defattr(-,root,root) -%{_kde4_libdir}/libqmobipocket.so.* -%{_kde4_modulesdir}/mobithumbnail.so -%{_kde4_servicesdir}/mobithumbnail.desktop +%{_libdir}/libqmobipocket.so.* +%{_kf5_plugindir}/mobithumbnail.so +%{_kf5_servicesdir}/mobithumbnail.desktop %files devel %defattr(-,root,root) -%{_kde4_libdir}/libqmobipocket.so -%{_kde4_libdir}/cmake/QMobipocket/ -%{_kde4_includedir}/qmobipocket/ +%{_libdir}/libqmobipocket.so +%{_libdir}/cmake/QMobipocket/ +%{_includedir}/qmobipocket/ %changelog