From d929ae16da8097c02b7cca775817a4d6a74b2f01 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 03 2014 02:21:07 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 6da7e37..bc15d8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
-/pykde4-4.10.1.tar.xz
-/pykde4-4.10.2.tar.xz
-/pykde4-4.10.3.tar.xz
-/pykde4-4.10.4.tar.xz
-/pykde4-4.10.90.tar.xz
-/pykde4-4.10.95.tar.xz
-/pykde4-4.10.97.tar.xz
-/pykde4-4.11.0.tar.xz
-/pykde4-4.11.1.tar.xz
-/pykde4-4.11.2.tar.xz
 /pykde4-4.11.3.tar.xz
+/pykde4-4.11.90.tar.xz
+/pykde4-4.11.95.tar.xz
+/pykde4-4.11.97.tar.xz
+/pykde4-4.12.0.tar.xz
+/pykde4-4.12.1.tar.xz
+/pykde4-4.12.2.tar.xz
diff --git a/pykde4.spec b/pykde4.spec
index 1e286f4..a6cb76f 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:    pykde4 
-Version: 4.11.3
+Version: 4.12.2
 Release: 1%{?dist}
 Summary: Python bindings for KDE4 
 
@@ -72,7 +72,7 @@ BuildRequires: qscintilla-devel >= 2.4
 %endif
 
 Requires: kdelibs4%{?_isa} >= %{version}
-Requires: kate-part%{?_isa} >= %{version}
+Requires: kate-part%{?_isa}
 %global pyqt4_version %(%{__python} -c 'import PyQt4.pyqtconfig; print(PyQt4.pyqtconfig._pkg_config["pyqt_version_str"])' 2> /dev/null || echo %{pyqt4_version_min})
 Requires: PyQt4 >= %{pyqt4_version}
 %if 0%{?webkit}
@@ -280,6 +280,27 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/
 
 
 %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
+
+* Thu Dec 19 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
+
+* Fri Nov 15 2013 Rex Dieter <rdieter@fedoraproject.org> 4.11.90-2
+- make kate-part dep unversioned
+
+* Fri Nov 15 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
 
diff --git a/sources b/sources
index a3a6ac2..c5f9929 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-218246803f0bd3f601523e01863a4d9e  pykde4-4.11.3.tar.xz
+e8a8d42bc391aba65337057892fa7b25  pykde4-4.12.2.tar.xz