diff --git a/.gitignore b/.gitignore index a3c9275..fddd172 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -/kdegraphics-mobipocket-16.04.0.tar.xz -/kdegraphics-mobipocket-16.04.1.tar.xz -/kdegraphics-mobipocket-16.04.2.tar.xz -/kdegraphics-mobipocket-16.04.3.tar.xz -/kdegraphics-mobipocket-16.07.80.tar.xz -/kdegraphics-mobipocket-16.07.90.tar.xz -/kdegraphics-mobipocket-16.08.0.tar.xz -/kdegraphics-mobipocket-16.08.1.tar.xz -/kdegraphics-mobipocket-16.08.2.tar.xz -/kdegraphics-mobipocket-16.08.3.tar.xz +/kdegraphics-mobipocket-16.12.1.tar.xz diff --git a/kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch b/kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch deleted file mode 100644 index cf74ca5..0000000 --- a/kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdegraphics-mobipocket-4.12.0/QMobipocketConfig.cmake.kde_includes_hint kdegraphics-mobipocket-4.12.0/QMobipocketConfig.cmake ---- kdegraphics-mobipocket-4.12.0/QMobipocketConfig.cmake.kde_includes_hint 2013-11-04 14:42:18.000000000 -0600 -+++ kdegraphics-mobipocket-4.12.0/QMobipocketConfig.cmake 2013-12-30 18:35:15.532983870 -0600 -@@ -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.spec b/kdegraphics-mobipocket.spec index 1d6ad99..0fd9716 100644 --- a/kdegraphics-mobipocket.spec +++ b/kdegraphics-mobipocket.spec @@ -1,15 +1,11 @@ -%if 0%{?fedora} < 25 -%global strigi 1 -%endif - Name: kdegraphics-mobipocket Summary: A collection of plugins to handle mobipocket files -Version: 16.08.3 +Version: 16.12.1 Release: 1%{?dist} License: GPLv2+ -URL: https://quickgit.kde.org/?p=%{name}.git +URL: https://www.kde.org/applications/graphics/ %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable @@ -18,51 +14,37 @@ URL: https://quickgit.kde.org/?p=%{name}.git %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz -## upstreamable patches -Patch50: kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch - -BuildRequires: desktop-file-utils -BuildRequires: kdelibs4-devel >= 4.14 -%if 0%{?strigi} -BuildRequires: pkgconfig(libstreams) -%endif +BuildRequires: extra-cmake-modules +BuildRequires: kf5-rpm-macros +BuildRequires: cmake(Qt5Gui) Requires: qmobipocket%{?_isa} = %{version}-%{release} -# when split occurred -Conflicts: kdegraphics < 7:4.6.95-10 - -# pkg renamed -Obsoletes: mobipocket < 4.7.97 -Provides: mobipocket = %{version}-%{release} +Obsoletes: qmobipocket < 16.12.0 +Provides: qmobipocket = %{version}-%{release} +Provides: qmobipocket%{?_isa} = %{version}-%{release} %description %{summary}. -%package -n qmobipocket -Summary: Mobipocket Qt bindings -%description -n qmobipocket -%{summary}. - -%package -n qmobipocket-devel -Summary: Development files for qmobipocket -Requires: qmobipocket%{?_isa} = %{version}-%{release} -%description -n qmobipocket-devel +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: qmobipocket-devel < 16.12.0 +Provides: qmobipocket-devel = %{version}-%{release} +Provides: qmobipocket-devel%{?_isa} = %{version}-%{release} +%description devel %{summary}. - %prep -%setup -q - -%patch50 -p1 -b .qmobipocket_kde4_includes_hint +%autosetup %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. \ - %{!?strigi:-DBUILD_strigi:BOOL=OFF} +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -72,29 +54,26 @@ make %{?_smp_mflags} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%files -%license COPYING -%{_kde4_libdir}/kde4/mobithumbnail.so -%{_kde4_datadir}/kde4/services/mobithumbnail.desktop -%if 0%{?strigi} -%{_kde4_libdir}/strigi/strigila_mobi.so -%endif - -%post -n qmobipocket -p /sbin/ldconfig -%postun -n qmobipocket -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig -%files -n qmobipocket +%files %license COPYING -%{_kde4_libdir}/libqmobipocket.so.1* +%{_libdir}/libqmobipocket.so.2* +%{_qt5_plugindir}/mobithumbnail.so +%{_kf5_datadir}/kservices5/mobithumbnail.desktop -%files -n qmobipocket-devel -%{_kde4_libdir}/libqmobipocket.so -%{_kde4_includedir}/qmobipocket/ -%dir %{_kde4_libdir}/cmake/ -%{_kde4_libdir}/cmake/QMobipocket/ +%files devel +%{_libdir}/libqmobipocket.so +%{_includedir}/qmobipocket/ +%dir %{_libdir}/cmake/ +%{_libdir}/cmake/QMobipocket/ %changelog +* Thu Jan 12 2017 Rex Dieter - 16.12.1-1 +- 16.12.1, kf5-ize, simplify packaging (just base + -devel subpkg) + * Mon Dec 05 2016 Rex Dieter - 16.08.3-1 - 16.08.3 diff --git a/sources b/sources index a012878..5815857 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -973528479d51186529fbd17f93f1671f kdegraphics-mobipocket-16.08.3.tar.xz +SHA512 (kdegraphics-mobipocket-16.12.1.tar.xz) = c7bd2127b244de0b4daf5814b13a8a74f061f97568e61434297822ff10ffd56bb987664c5319588ef2a1578fb6013dd82100b55295ed2893903cda6f2e89effd