Merge branch 'master' into f17

Conflicts:
	.gitignore
	kdegraphics-mobipocket.spec
	sources

.gitignore

@@ -1,3 +1,2 @@
-/kdegraphics-mobipocket-4.8.3.tar.xz
-/kdegraphics-mobipocket-4.8.4.tar.xz
 /kdegraphics-mobipocket-4.8.5.tar.xz
+/kdegraphics-mobipocket-4.9.1.tar.xz

kdegraphics-mobipocket.spec

@@ -1,6 +1,6 @@
 Name:    kdegraphics-mobipocket 
 Summary: A collection of plugins to handle mobipocket files 
-Version: 4.8.5
+Version: 4.9.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -18,7 +18,9 @@ BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: okular-devel >= %{version}
 BuildRequires: pkgconfig(libstreams)
 
-Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+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
 
@@ -63,11 +65,30 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okularAppli
 
 
 %changelog
-* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.5-1
+* Mon Sep 03 2012 Than Ngo <than@redhat.com> - 4.9.1-1
-- 4.8.5
+- 4.9.1
+
+* Sat Aug 25 2012 Rex Dieter <rdieter@fedoraproject.org> 4.9.0-2
+- s/kdebase-runtime/kde-runtime/
+- Requires: okular-libs
+
+* Thu Jul 26 2012 Lukas Tinkl <ltinkl@redhat.com> - 4.9.0-1
+- 4.9.0
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.97-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jul 12 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.97-1
+- 4.8.97
+
+* Wed Jun 27 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.95-1
+- 4.8.95
+
+* Sat Jun 09 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.90-1
+- 4.8.90
 
-* Mon Jun 04 2012 Than Ngo <than@redhat.com> - 4.8.4-1
+* Sun Jun 03 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.80-1
-- 4.8.4
+- 4.8.80
 
 * Mon Apr 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.3-1
 - 4.8.3

sources

@@ -1 +1 @@
-09e8d9fe956a856d76d4965b9b003e2a  kdegraphics-mobipocket-4.8.5.tar.xz
+d6034168af396566d1cdc8c2cec9275e  kdegraphics-mobipocket-4.9.1.tar.xz