Merge branch 'master' into f20

.gitignore

@@ -1,17 +1 @@
-/kdegraphics-mobipocket-4.8.5.tar.xz
+/kdegraphics-mobipocket-4.12.2.tar.xz
-/kdegraphics-mobipocket-4.9.1.tar.xz
-/kdegraphics-mobipocket-4.9.2.tar.xz
-/kdegraphics-mobipocket-4.9.3.tar.xz
-/kdegraphics-mobipocket-4.9.4.tar.xz
-/kdegraphics-mobipocket-4.9.5.tar.xz
-/kdegraphics-mobipocket-4.10.1.tar.xz
-/kdegraphics-mobipocket-4.10.2.tar.xz
-/kdegraphics-mobipocket-4.10.3.tar.xz
-/kdegraphics-mobipocket-4.10.4.tar.xz
-/kdegraphics-mobipocket-4.10.90.tar.xz
-/kdegraphics-mobipocket-4.10.95.tar.xz
-/kdegraphics-mobipocket-4.10.97.tar.xz
-/kdegraphics-mobipocket-4.11.0.tar.xz
-/kdegraphics-mobipocket-4.11.1.tar.xz
-/kdegraphics-mobipocket-4.11.2.tar.xz
-/kdegraphics-mobipocket-4.11.3.tar.xz

kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch

@@ -0,0 +1,12 @@
+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 

kdegraphics-mobipocket.spec

@@ -1,6 +1,6 @@
 Name:    kdegraphics-mobipocket 
 Summary: A collection of plugins to handle mobipocket files 
-Version: 4.11.3
+Version: 4.12.2
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -13,13 +13,15 @@ URL:     https://projects.kde.org/projects/kde/kdegraphics/mobipocket
 %endif
 Source0: http://download.kde.org/%{stable}/%{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 >= %{version}
-BuildRequires: okular-devel >= %{version}
 BuildRequires: pkgconfig(libstreams)
 
+Requires: qmobipocket%{?_isa} = %{version}-%{release}
 Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
-Requires: okular-libs%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 
 # when split occurred
 Conflicts: kdegraphics < 7:4.6.95-10
@@ -31,10 +33,24 @@ Provides:  mobipocket = %{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
+%{summary}.
+
+
 
 %prep
 %setup -q 
 
+%patch50 -p1 -b .qmobipocket_kde4_includes_hint
+
 
 %build
 mkdir -p %{_target_platform}
@@ -49,22 +65,47 @@ make %{?_smp_mflags} -C %{_target_platform}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
-%check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okularApplication_mobi.desktop
-
-
 %files 
 %doc COPYING
 %{_kde4_libdir}/kde4/mobithumbnail.so
-%{_kde4_libdir}/kde4/okularGenerator_mobi.so
 %{_kde4_libdir}/strigi/strigila_mobi.so
-%{_kde4_datadir}/applications/kde4/okularApplication_mobi.desktop
-%{_kde4_datadir}/kde4/services/libokularGenerator_mobi.desktop
 %{_kde4_datadir}/kde4/services/mobithumbnail.desktop
-%{_kde4_datadir}/kde4/services/okularMobi.desktop
+
+%post -n qmobipocket -p /sbin/ldconfig
+%postun -n qmobipocket -p /sbin/ldconfig
+
+%files -n qmobipocket
+%{_kde4_libdir}/libqmobipocket.so.1*
+
+%files -n qmobipocket-devel
+%{_kde4_libdir}/libqmobipocket.so
+%{_kde4_includedir}/qmobipocket/
+%dir %{_kde4_libdir}/cmake/
+%{_kde4_libdir}/cmake/QMobipocket/
 
 
 %changelog
+* Fri Jan 31 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.2-1
+- 4.12.2
+
+* Fri Jan 10 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.1-1
+- 4.12.1
+
+* Mon Dec 30 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.12.0-2
+- qmobipocket_kde4_includes_hint.patch
+
+* Wed Dec 18 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.12.0-1
+- 4.12.0
+
+* Sun Dec 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.97-1
+- 4.11.97
+
+* Thu Nov 21 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.95-1
+- 4.11.95
+
+* Sat Nov 16 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.90-1
+- 4.11.90
+
 * Sat Nov 02 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.3-1
 - 4.11.3
 

sources

@@ -1 +1 @@
-35e925429931cc41295924d2c158e59d  kdegraphics-mobipocket-4.11.3.tar.xz
+6733ad2accad3cc13cd6e922a4ebf867  kdegraphics-mobipocket-4.12.2.tar.xz